diff --git a/App.vue b/App.vue
index 3d81af7..dfb0261 100644
--- a/App.vue
+++ b/App.vue
@@ -10,8 +10,14 @@
 			console.log('App Hide')
 		}
 	}
-</script>
+</script>
+
+<style>
+	page{
+		background: #F5F5F5;
+	}
+</style>
 
-<style lang="scss" scoped>
+<style lang="scss">
 	@import "uview-ui/index.scss";
 </style>
diff --git a/apis/index.js b/apis/index.js
index 76f9f15..ec79c85 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -9,7 +9,7 @@ import store from '@/store'
 
 // 基础配置
 const config = {
-	apiUrl	: 'https://e-chain.cnskl.com/api/',
+	apiUrl	: 'http://api.ahxh.shangkelian.cn/api/',
 	timeout	: 60000
 }
 
diff --git a/apis/interfaces/chain.js b/apis/interfaces/chain.js
new file mode 100644
index 0000000..cd75ebe
--- /dev/null
+++ b/apis/interfaces/chain.js
@@ -0,0 +1,44 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 区块链
+ */
+
+import { request } from '../index'
+
+// 最新区块列表
+const chain = () => {
+	return request({
+		url: 'chain'
+	})
+}
+
+// 发行量概况
+const situation = () => {
+	return request({
+		url: 'nodes'
+	})
+}
+
+// 区块详情
+const hash = (hash) => {
+	return request({
+		url: 'chain/block/' + hash
+	})
+}
+
+// 区块链首页
+const occ = () => {
+	return request({
+		url: 'occ/index'
+	})
+}
+
+export {
+	chain,
+	situation,
+	hash,
+	occ
+}
diff --git a/apis/interfaces/company.js b/apis/interfaces/company.js
index 40546a0..23dca6c 100644
--- a/apis/interfaces/company.js
+++ b/apis/interfaces/company.js
@@ -24,22 +24,6 @@ const inits = data => {
 	})
 }
 
-// 企业广场
-const companies = data => {
-	return request({
-		url: 'companies',
-		data
-	})
-}
-
-// 企业列表
-const companiesList = data => {
-	return request({
-		url: 'companies/lists',
-		data
-	})
-}
-
 // 企业认证配置信息
 const appliesCreate = () => {
 	return request({
@@ -89,8 +73,6 @@ const appliesCategory = data => {
 export {
 	createConfig,
 	inits,
-	companies,
-	companiesList,
 	appliesCreate,
 	applies,
 	isallow,
diff --git a/apis/interfaces/coupons.js b/apis/interfaces/coupons.js
index 9bf6a9c..11ac44a 100644
--- a/apis/interfaces/coupons.js
+++ b/apis/interfaces/coupons.js
@@ -33,14 +33,6 @@ const couponsGoods = data => {
 	})
 }
 
-// 设置关联商品*********已废弃
-const couponsAddgoods = (id, data) => {
-	return request({
-		url: 'coupons/tools/coupons/' + id + '/addgoods',
-		method: 'POST',
-		data
-	})
-}
 
 // 管理优惠券详情
 const magCouponsInfo = (id) => {
@@ -68,7 +60,6 @@ export {
 	toolsCoupons,
 	pushCoupons,
 	couponsGoods,
-	couponsAddgoods,
 	magCouponsInfo,
 	magCouponsStatus,
 	magCouponsRecommend
diff --git a/apis/interfaces/crystal.js b/apis/interfaces/crystal.js
new file mode 100644
index 0000000..96f97f6
--- /dev/null
+++ b/apis/interfaces/crystal.js
@@ -0,0 +1,63 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 矿机
+ */
+
+import { request } from '../index'
+
+// 水晶原石
+const crystals = () => {
+	return request({
+		url: 'user/account/crystals'
+	})
+}
+
+// 领取水晶
+const thawlog = (data) => {
+	return request({
+		url: 'user/account/thawlog',
+		method: 'POST',
+		data
+	})
+}
+
+// 水晶分类
+const category = () => {
+	return request({
+		url: 'crystal/category'
+	})
+}
+
+// 水晶任务
+const task = () => {
+	return request({
+		url: 'crystal/task'
+	})
+}
+
+// 水晶用户签到-信息
+const sign = () => {
+	return request({
+		url: 'user/sign'
+	})
+}
+
+// 水晶用户签到
+const operateSign = () => {
+	return request({
+		url: 'user/sign',
+        method: 'POST'
+	})
+}
+
+export{
+	crystals,
+	thawlog,
+    category,
+	task,
+    sign,
+    operateSign
+}
diff --git a/apis/interfaces/goods.js b/apis/interfaces/goods.js
index 9d43479..94ad9ee 100644
--- a/apis/interfaces/goods.js
+++ b/apis/interfaces/goods.js
@@ -8,27 +8,6 @@
 
 import { request } from '../index'
 
-// 商城首页
-const mall = data => {
-	return request({
-		url: "mall"
-	})
-}
-
-// 商品列表
-const list = data => {
-	return request({
-		url: "mall/goods",
-		data
-	})
-}
-
-// 商品详情
-const goods = id => {
-	return request({
-		url: 'mall/goods/' + id
-	})
-}
 
 // 商品管理-商品列表
 const managesGoodsIndex = data => {
@@ -56,22 +35,6 @@ const managesGoodsBurn = data => {
 	})
 }
 
-// 商品管理-商品上架  ********已废弃
-const managesGoodsOnsale = id => {
-	return request({
-		url: 'manages/goods/'+id+'/onsale',
-		method:'PUT'
-	})
-}
-
-// 商品管理-商品下架   ********已废弃
-const managesGoodsOffsale = id => {
-	return request({
-		url: 'manages/goods/'+id+'/offsale',
-		method:'PUT'
-	})
-}
-
 // 发布商品前置
 const managesGoodsCreateBefore = () => {
 	return request({
@@ -126,35 +89,6 @@ const managesGoodsEdit = id => {
 		url: 'manages/goods/' + id
 	})
 }
-
-// 区块链证书
-const managesChain = (id) => {
-    return request({
-    	url: 'mall/goods/'+ id + '/chain'
-    })
-}
-
-// 商品认证
-const managesAttestation = (id) => {
-    return request({
-        url: 'mall/goods/'+ id +'/message'
-    })
-}
-
-// 商品溯源
-const managesTracedTo = (id) => {
-    return request({
-        url: 'mall/goods/'+ id +'/trace'
-    })
-}
-
-// 领取优惠券
-const managesCoupons = (id) => {
-    return request({
-        url: 'coupons/'+ id +'/grant',
-        method: 'POST'
-    })
-}
 
 // 产品编辑
 const managesGoodsPut = (id, data) => {
@@ -173,14 +107,9 @@ const managesGoodsExtends = id => {
 }
 
 export {
-	mall,
-	list,
-	goods,
 	managesGoodsIndex,
 	managesGoodsMint,
 	managesGoodsBurn,
-	managesGoodsOnsale,
-	managesGoodsOffsale,
 	managesGoodsCreateBefore,
 	managesGoodsCreate,
 	managesCategory,
@@ -188,10 +117,6 @@ export {
 	managesGoodsDelete,
 	managesGoodsEdit,
 	managesCreate,
-    managesChain,
-    managesAttestation,
-    managesTracedTo,
-    managesCoupons,
 	managesGoodsPut,
 	managesGoodsExtends
 }
diff --git a/apis/interfaces/index.js b/apis/interfaces/index.js
new file mode 100644
index 0000000..8343eea
--- /dev/null
+++ b/apis/interfaces/index.js
@@ -0,0 +1,123 @@
+/**
+ * Web-zdx
+ * moduleName: 商城首页
+ */
+
+import { request } from '../index'
+
+// 首页信息
+const index = () => {
+  return request({
+    url: 'mall',
+    method: 'GET'
+  })
+}
+// 今日特惠页面 （大于三显示3个 两个显示两个 1个就显示一张图）
+const indexT = (data) => {
+  return request({
+    url: 'mall/goods',
+    method: 'GET',
+    data:data
+  })
+}
+//  获取首页弹窗
+const popups = () => {
+  return request({
+    url: 'popups/mall',
+    method: 'GET'
+  })
+}
+const banner = () => {
+  return request({
+    url: 'mall/banners',
+    method: 'GET'
+  })
+}
+
+//  全养头条
+const cmsArticles = () => {
+  return request({
+    url: 'cms/articles',
+    method: 'GET'
+  })
+}
+
+//  全养头条详情
+const cmsArticlesDetail = (id) => {
+  return request({
+    url: 'cms/articles/'+id,
+    method: 'GET'
+  })
+}
+
+// 获取是否有未读消息
+const notifyCounts = () => {
+  return request({
+    url: 'notifications/counts',
+    method: 'GET'
+  })
+}
+
+// 判断是否能跳转到钱包页面
+const canGoWallet = () => {
+  return request({
+    url: 'user/datas',
+    method: 'GET'
+  })
+}
+
+// 是否设置了激活激活钱包
+const security = () => {
+  return request({
+    url: 'chain/safe/security',
+    method: 'GET'
+  })
+}
+
+// 是否个人认证成功
+const certified = () => {
+  return request({
+    url: 'user/certified',
+    method: 'GET'
+  })
+}
+
+// 获取首页商品列表 taos ='淘宝客' goods/mall （自己商品）
+const getIndexGoodsList = (name,data) => {
+  return request({
+    url: name,
+    method: 'GET',
+    data:data
+  })
+}
+// 获取淘宝客的标签
+const getTaoCategories = () =>{
+  return request({
+    url: 'tao/categories',
+    method: 'GET'
+  })
+}
+// 获取自营的标签
+const getTags = () =>{
+  return request({
+    url: 'mall/tags',
+    method: 'GET'
+  })
+}
+
+
+export {
+  index,
+  cmsArticles,
+  notifyCounts,
+  cmsArticlesDetail,
+  canGoWallet,
+  security,
+  certified,
+  getIndexGoodsList,
+  getTaoCategories,
+  getTags,
+  banner,
+  popups,
+  indexT
+}
diff --git a/apis/interfaces/login.js b/apis/interfaces/login.js
new file mode 100644
index 0000000..88fce9c
--- /dev/null
+++ b/apis/interfaces/login.js
@@ -0,0 +1,76 @@
+/**
+ * Web-zdx
+ * moduleName: 登录（手机号）
+ */
+
+import { request } from '../index'
+
+// 手机号登陆接口
+const login = (data) => {
+	return request({
+		url: 'user/socialite/login/wechat/mini',
+		method: 'POST',
+		data: data
+	})
+}
+// 修改用户信息
+const wechatbind = (data) => {
+	return request({
+		url: 'user/socialite/wechatbind',
+		method: 'PUT',
+		data: data
+	})
+}
+
+// 修改用户头像或昵称
+const resetUserInfo = (data) => {
+	return request({
+		url: 'user/' + data.key,
+		method: 'PUT',
+		data: {
+			value: data.value
+		}
+	})
+}
+
+// 获取用户的Openid
+const getOpenid = (code) => {
+	return request({
+		url: 'user/socialite/login/wechat/openid',
+		method: 'GET',
+		data: {
+			code: code
+		}
+	})
+
+}
+// 隐私条款
+const agreementSecret = (data) => {
+	return request({
+		url: 'articles/agreement/secret'
+	})
+}
+
+// 注册协议
+const agreementLogin = (data) => {
+	return request({
+		url: 'articles/agreement/login'
+	})
+}
+
+// 获取用户设置中心的信息
+const getUserSettingInfo = () => {
+  return request({
+    url: 'user/setting'
+  })
+}
+
+export {
+	login,
+	wechatbind,
+	getOpenid,
+	agreementSecret,
+	agreementLogin,
+	resetUserInfo,
+	getUserSettingInfo
+}
diff --git a/apis/interfaces/market.js b/apis/interfaces/market.js
deleted file mode 100644
index 9d10a14..0000000
--- a/apis/interfaces/market.js
+++ /dev/null
@@ -1,102 +0,0 @@
-
-/**
- * Web唐明明
- * 匆匆数载恍如梦，岁月迢迢华发增。
- * 碌碌无为枉半生，一朝惊醒万事空。
- * moduleName: 转让市场
- */
-
-import { request } from '../index'
-
-// 转让市场
-const markets = data => {
-	return request({
-		url: 'markets',
-		data
-	})
-}
-
-// 转让市场记录
-const marketsLogs = data => {
-	return request({
-		url: 'markets/orders',
-		data
-	})
-}
-
-// 转让详情
-const marketsInfo = id => {
-	return request({
-		url: 'markets/' + id
-	})
-}
-
-// 提交支付订单
-const marketsBuy = (id, data) => {
-	return request({
-		url: 'markets/' + id + '/create',
-		method: 'POST',
-		data
-	})
-}
-
-// 转让市场支付
-const marketsPay = (id, platform) => {
-	return request({
-		url: 'markets/pay/' + id + '/' + platform
-	})
-}
-
-// 转让权证信息
-const marketsCreateInfo = symbol => {
-	return request({
-		url: 'markets/user/markets/create',
-		data: { symbol }
-	})
-}
-
-// 提交权证转让
-const marketsCreate = data => {
-	return request({
-		url: 'markets/user/markets/create',
-		method: 'POST',
-		data
-	})
-}
-
-// 转让管理
-const marketsMag = data => {
-	return request({
-		url: 'markets/user/markets',
-		data
-	})
-}
-
-// 取消转让
-const marketsCancel = id => {
-	return request({
-		url: 'markets/' + id + '/cancel',
-		method: 'POST'
-	})
-}
-
-// 我的成交理事
-const marketsOrdersLogs = (data, name) => {
-	return request({
-		url: 'markets/orders/' + name,
-		data
-	})
-}
-
-export {
-	markets,
-	marketsLogs,
-	marketsInfo,
-	marketsBuy,
-	marketsPay,
-	marketsCreateInfo,
-	marketsCreate,
-	marketsMag,
-	marketsCancel,
-	marketsOrdersLogs
-}
diff --git a/apis/interfaces/numberWeight.js b/apis/interfaces/numberWeight.js
deleted file mode 100644
index 348be97..0000000
--- a/apis/interfaces/numberWeight.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Web-zdx
- * moduleName: 我的数权
- */
-
-import { request } from '../index'
-
-// 我的数权
-const mallWarrants = (data) => {
-  return request({
-    url: 'mall/warrants',
-    method: 'GET',
-    data: data
-  })
-}
-
-// 我的数权Id获取数权详情
-const mallWarrantsList = (symbol) => {
-  return request({
-    url: 'mall/warrants/exchange',
-    method: 'GET',
-    data: {
-		symbol:symbol
-	}
-  })
- }
- 
-// 确认提货
-const mallWarrantsSure = (data) => {
-  return request({
-    url: 'mall/warrants/exchange',
-    method: 'POST',
-    data: data
-  })
-}
-
-// 我的邮寄订单，我的提货单
-const mallShipmentsPostShop = (apiUrl,data) => {
-  return request({
-    url: apiUrl,
-    method: 'GET',
-    data: data
-  })
-}
-
-// 根据提货单的no 获取提货单的详情
-const mallShipmentsInfo = (no) => {
-  return request({
-    url: 'mall/shipments/'+no,
-    method: 'GET'
-  })
-}
-
-// 取消提货单
-const mallShipmentsCancel = (shipmentNo) => {
-  return request({
-    url: 'mall/shipments/'+ shipmentNo+'/cancel',
-    method: 'POST'
-  })
-}
-
-// 签收提货单
-const mallShipmentsSign = (shipmentNo) => {
-  return request({
-    url: 'mall/shipments/'+ shipmentNo+'/sign',
-    method: 'POST'
-  })
-}
-
-// 退货单申请退货
-const mallShipmentsRefund = (data) => {
-  return request({
-    url: 'mall/shipments/'+ data.shipment_no+'/refund',
-    method: 'POST',
-	data:data
-  })
-}
-
-// 退货单申请退货前置条件
-const mallShipmentsRefundInfo = (shipmentNo) => {
-  return request({
-    url: 'mall/shipments/'+ shipmentNo+'/refund',
-    method: 'GET'
-  })
-}
-
-// 查看物流接口
-const mallShipmentsLogistic = (shipmentNo) => {
-  return request({
-    url: 'mall/shipments/'+ shipmentNo+'/logistic',
-    method: 'GET'
-  })
-}
-
-// 我的退货单 mall/refunds
-const mallRefunds = (data) => {
-  return request({
-    url: 'mall/refunds',
-    method: 'GET',
-    data: data
-  })
-}
-
-//退货单详情页 
-const mallRefundsInfo = (no) => {
-  return request({
-    url: 'mall/refunds/'+no,
-    method: 'GET'
-  })
-}
-
-// 确认退货mall/refunds/{refund}/deliver
-const mallRefundsDeliver = (data) => {
-  return request({
-    url: 'mall/refunds/'+data.refund+'/deliver',
-    method: 'POST',
-	data:data
-  })
-}
-
-// 提货单或者服务单生成提货二维码
-const mallWarrantsQrcode = (data) => {
-  return request({
-    url: 'mall/warrants/qrcode',
-    method: 'GET',
-	data:data
-  })
-}
-
-
-export {
-  mallWarrants,
-  mallWarrantsList,
-  mallWarrantsSure,
-  mallShipmentsPostShop,
-  mallShipmentsInfo,
-  mallShipmentsCancel,
-  mallShipmentsSign,
-  mallShipmentsRefund,
-  mallShipmentsRefundInfo,
-  mallShipmentsLogistic,
-  mallRefunds,
-  mallRefundsInfo,
-  mallRefundsDeliver,
-  mallWarrantsQrcode
-}
diff --git a/apis/interfaces/order.js b/apis/interfaces/order.js
deleted file mode 100644
index 387c123..0000000
--- a/apis/interfaces/order.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-/**
- * Web唐明明
- * 匆匆数载恍如梦，岁月迢迢华发增。
- * 碌碌无为枉半生，一朝惊醒万事空。
- * moduleName: 订单
- */
-
-import { request } from '../index'
-
-// 创建，确认订单
-const buy = (data, method) => {
-	return request({
-		url: 'mall/buy/goods',
-		method,
-		data
-	})
-}
-
-// eb支付
-const eb = (no) => {
-	return request({
-		url: 'mall/pay/' + no + '/eb',
-	})
-}
-
-export {
-	buy,
-	eb
-}
diff --git a/apis/interfaces/scan.js b/apis/interfaces/scan.js
index 63a17a8..82c5faf 100644
--- a/apis/interfaces/scan.js
+++ b/apis/interfaces/scan.js
@@ -3,29 +3,31 @@
  * moduleName:核销相关操作
  */
 
-import { request } from '../index'
+import {
+	request
+} from '../index'
 
 
 // 扫码前置条件 get 核销前置  post 表示核销
-const scanInfo = (apiUrl,data,method) => {
-  return request({
-    url: apiUrl,
-    method:method,
-    data:data
-  })
+const scanInfo = (apiUrl, data, method) => {
+	return request({
+		url: apiUrl,
+		method: method,
+		data: data
+	})
 }
 
 // 核销记录
-const scanList = (apiUrl,data) => {
-  return request({
-    url: apiUrl,
-    method:'GET',
-    data:data
-  })
+const scanList = (apiUrl, data) => {
+	return request({
+		url: apiUrl,
+		method: 'GET',
+		data: data
+	})
 }
 
 
 export {
-  scanInfo,
-  scanList
+	scanInfo,
+	scanList
 }
diff --git a/apis/interfaces/setting.js b/apis/interfaces/setting.js
new file mode 100644
index 0000000..956163f
--- /dev/null
+++ b/apis/interfaces/setting.js
@@ -0,0 +1,84 @@
+/**
+ * Web-zdx
+ * moduleName: 登录（手机号）
+ */
+
+import { request } from '../index'
+
+// 手机号登陆接口
+const login = (data) => {
+	return request({
+		url: 'user/socialite/login/wechat/mini',
+		method: 'POST',
+		data: data
+	})
+}
+// 修改用户信息
+const wechatbind = (data) => {
+	return request({
+		url: 'user/socialite/wechatbind',
+		method: 'PUT',
+		data: data
+	})
+}
+
+// 修改用户头像或昵称
+const resetUserInfo = (data) => {
+	return request({
+		url: 'user/' + data.key,
+		method: 'PUT',
+		data: {
+			value: data.value
+		}
+	})
+}
+
+// 获取用户的Openid
+const getOpenid = (code) => {
+	return request({
+		url: 'user/socialite/login/wechat/openid',
+		method: 'GET',
+		data: {
+			code: code
+		}
+	})
+
+}
+// 隐私条款
+const agreementSecret = (data) => {
+	return request({
+		url: 'articles/agreement/secret'
+	})
+}
+
+// 注册协议
+const agreementLogin = (data) => {
+	return request({
+		url: 'articles/agreement/login'
+	})
+}
+
+// 获取用户设置中心的信息
+const getUserSettingInfo = () => {
+  return request({
+    url: 'user/setting'
+  })
+}
+
+// 关于我们
+const aboutUs = () => {
+  return request({
+    url: 'articles/about'
+  })
+}
+
+export {
+	login,
+	wechatbind,
+	getOpenid,
+	agreementSecret,
+	agreementLogin,
+	resetUserInfo,
+	getUserSettingInfo,
+	aboutUs
+}
diff --git a/apis/interfaces/store.js b/apis/interfaces/store.js
index 507ab2b..a54db7f 100644
--- a/apis/interfaces/store.js
+++ b/apis/interfaces/store.js
@@ -15,14 +15,6 @@ const index = () => {
 	})
 }
 
-// 成交客户  *********已废弃
-const customer = data => {
-	return request({
-		url: 'mall/statistics',
-		data
-	})
-}
-
 // 成交客户
 const orderUsers = data => {
 	return request({
@@ -151,7 +143,6 @@ const deliverLogistic = (shipment__no) => {
 
 export {
 	index,
-	customer,
 	orderUsers,
 	visitors,
 	basicsConfig,
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
new file mode 100644
index 0000000..8bbf401
--- /dev/null
+++ b/components/goods-list/goods-list.vue
@@ -0,0 +1,137 @@
+
+<template>
+	<view class="goods--list">
+		<block v-if="list.length > 0">
+			<view class="goods--item" v-for="(item, index) in list" :key="index" @click="goods(item)">
+				<view class="cover">
+					<image class="cover--src" :src="item.cover" mode="aspectFill" />
+				</view>
+				<view class="content">
+					<view class="title">{{item.name}}</view>
+					<view class="content-flex">
+						<view class="price eb" v-if="priceType === 'EB'">
+							{{item.price}}<text>易币</text>
+						</view>
+						<view class="price cny" v-if="priceType === 'CNY'">
+							<text>￥</text>{{item.original_price}}
+						</view>
+						<view class="sales">
+							<slot name="statistics" :value="item">
+								月易量{{item.sales}}
+							</slot>
+						</view>
+					</view>
+					<slot name="footer" :value="item" />
+				</view>
+			</view>
+		</block>
+		<block v-else>
+			<view class="goods--null">
+				<view>{{toast}}</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+export default {
+	name	: 'goodsList',
+	props	: {
+		// 数据列表
+		list: {
+			type	: Array,
+			default	: () => {
+				return new Array
+			}
+		},
+		// 价格类型
+		priceType: {
+			type	: String,
+			default	: 'EB'
+		},
+		// 列表空提示
+		toast	: {
+			type	: String,
+			default	: '暂无商品数据 -_-!'
+		}
+	},
+	methods:{
+		goods(e){
+			this.$emit('on-goods', e)
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.goods--list{
+		padding: calc(#{$padding} - 10rpx);
+		display: flex;
+		flex-wrap: wrap;
+		.goods--item{
+			background: white;
+			box-sizing: border-box;
+			width: calc(50% - 20rpx);
+			margin: 10rpx;
+			border-radius: $radius/2;
+			overflow: hidden;
+			.cover{
+				position: relative;
+				width: 100%;
+				padding-top: 100%;
+				.cover--src{
+					position: absolute;
+					height: 100%;
+					width: 100%;
+					top: 0;
+					left: 0;
+				}
+			}
+			.content{
+				padding: $padding/2;
+				.title{
+					font-size: $title-size-lg;
+					line-height: 40rpx;
+					height: 80rpx;
+					text-align: justify;
+					@extend .ellipsis;
+				}
+				.content-flex{
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+					padding-top: $padding/2;
+					.price{
+						width: 50%;
+						color: $text-price;
+						font-weight: bold;
+						font-size: $title-size;
+						@extend .nowrap;
+						text{
+							font-size: $title-size-sm;
+							font-weight: normal;
+							padding-left: $padding/4;
+							line-height: 50rpx;
+						}
+					}
+					.sales{
+						width: 50%;
+						font-size: $title-size-sm;
+						color: $text-gray;
+						line-height: 50rpx;
+						text-align: right;
+						@extend .nowrap;
+					}
+				}
+			}
+		}
+	}
+	// 数据空
+	.goods--null{
+		width: 100%;
+		padding: 20vh 0;
+		text-align: center;
+		font-size: $title-size-m;
+		color: $text-gray;
+	}
+</style>
diff --git a/components/tn-datepicker/tn-datepicker.vue b/components/tn-datepicker/tn-datepicker.vue
new file mode 100644
index 0000000..b6f926d
--- /dev/null
+++ b/components/tn-datepicker/tn-datepicker.vue
@@ -0,0 +1,904 @@
+<template>
+	<view v-if="isShow" class="picker">
+		<view @click="onCancel" style="position: fixed;width: 100%;height: 100%;left: 0;top: 0;background: rgba(60,60,60,0.5)"></view>
+		<!-- 日期选择器 -->
+		<view v-if="type!='time'" :class="isShow?'myfirst':''" class="picker-modal">
+			<view class="picker-header">
+				<view class="close" @click="onCancel" style="font-size: 22px;width: 50upx;"></view>
+				<view style="flex: 1;font-size: 16px; text-align: center;color: rgb(102,101,91);">选择日期</view>
+				<view style="width: 50upx;"></view>
+			</view>
+			<view class="picker-week-header">
+				<view v-for="(item, index) in weekArr" :key="index">{{item}}</view>
+			</view>
+			<scroll-view class="picker-modal-body" @scroll="scrollPage" scroll-y="true" id="target">
+				<view class="picker-modal-header-title" style="position: fixed;height: 93upx;line-height: 93upx;margin-top:-1px;right: 1px;background: #fff;z-index: 999;">{{dateTitleArr[scrollIndex]}}</view>
+
+				<view class="picker-calendar-box" :id="'calendar_module'+calendar_Index" v-for="(calendar,calendar_Index) in calendars"
+				 :key="calendar_Index">
+					<view class="picker-modal-header-title" :class="" style="color:rgb(77,77,77); font-size: 16px; width: 100%;height: 90upx;line-height: 90upx;text-align: center;">{{dateTitleArr[calendar_Index]}}</view>
+					<view class="picker-calendar">
+						<view class="picker-calendar-view" v-for="(date,dateIndex) in calendar" :key="dateIndex">
+							<view v-show="!date.isOtherMonth || calendar_Index == 0" @click="onSelectDate(date)">
+								<!-- 背景样式 -->
+								<view v-show="date.bgStyle.type" :class="'picker-calendar-view-'+date.bgStyle.type" :style="{background: date.bgStyle.background}"></view>
+								<!-- 正常和选中样式 -->
+								<view class="picker-calendar-view-item" :style="{opacity: date.statusStyle.opacity, color: date.statusStyle.color, background: date.statusStyle.background}">
+									<text>{{date.title}}</text>
+								</view>
+								<!-- 小圆点样式 -->
+								<view class="picker-calendar-view-dot" :style="{opacity: date.dotStyle.opacity, background: date.dotStyle.background}"></view>
+								<!-- 信息样式 -->
+								<view v-show="date.tips" class="picker-calendar-view-tips">{{date.tips}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="picker-modal-footer" v-show="checkeds.length==2" style="position: fixed;bottom: 0;z-index: 1002;">
+					<view style="position: absolute;width: 100%;height: 100%;background: #fff;z-index: -1;left:0;top:1px;"></view>
+					<view class="picker-modal-footer-btnOK" :style="{'background':color}" @click="onConfirm">完成</view>
+				</view>
+				<view class="picker-modal-footer" v-show="checkeds.length==2"></view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * 工具函数库
+	 */
+	const DateTools = {
+		/**
+		 * 获取公历节日
+		 * @param date Date对象
+		 */
+		getHoliday(date) {
+			let holidays = {
+				'0101': '元旦',
+				'0214': '情人',
+				'0308': '妇女',
+				'0312': '植树',
+				'0401': '愚人',
+				'0501': '劳动',
+				'0504': '青年',
+				'0601': '儿童',
+				'0701': '建党',
+				'0801': '建军',
+				'0903': '抗日',
+				'0910': '教师',
+				'1001': '国庆',
+				'1031': '万圣',
+				'1224': '平安',
+				'1225': '圣诞'
+			};
+			let value = this.format(date, 'mmdd');
+			if (holidays[value]) return holidays[value];
+			return false;
+		},
+		/**
+		 * 解析标准日期格式
+		 * @param s 日期字符串
+		 * @return 返回Date对象
+		 */
+		parse: s => new Date(s.replace(/(年|月|-)/g, '/').replace(/(日)/g, '')),
+		/**
+		 * 比较日期是否为同一天
+		 * @param a Date对象
+		 * @param b Date对象
+		 * @return Boolean
+		 */
+		isSameDay: (a, b) => a.getMonth() == b.getMonth() && a.getFullYear() == b.getFullYear() && a.getDate() == b.getDate(),
+		/**
+		 * 格式化Date对象
+		 * @param d 日期对象
+		 * @param f 格式字符串
+		 * @return 返回格式化后的字符串
+		 */
+		format(d, f) {
+			var o = {
+				"m+": d.getMonth() + 1,
+				"d+": d.getDate(),
+				"h+": d.getHours(),
+				"i+": d.getMinutes(),
+				"s+": d.getSeconds(),
+				"q+": Math.floor((d.getMonth() + 3) / 3),
+			};
+			if (/(y+)/.test(f))
+				f = f.replace(RegExp.$1, (d.getFullYear() + "").substr(4 - RegExp.$1.length));
+			for (var k in o)
+				if (new RegExp("(" + k + ")").test(f))
+					f = f.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+			return f;
+		},
+		/**
+		 * 用于format格式化后的反解析
+		 * @param s 日期字符串
+		 * @param f 格式字符串
+		 * @return 返回Date对象
+		 */
+		inverse(s, f) {
+			var o = {
+				"y": '',
+				"m": '',
+				"d": '',
+				"h": '',
+				"i": '',
+				"s": '',
+			};
+			let d = new Date();
+			if (s.length != f.length) return d;
+			for (let i in f)
+				if (o[f[i]] != undefined) o[f[i]] += s[i];
+			if (o.y) d.setFullYear(o.y.length < 4 ? (d.getFullYear() + '').substr(0, 4 - o.y.length) + o.y : o.y);
+			o.m && d.setMonth(o.m - 1, 1);
+			o.d && d.setDate(o.d - 0);
+			o.h && d.setHours(o.h - 0);
+			o.i && d.setMinutes(o.i - 0);
+			o.s && d.setSeconds(o.s - 0);
+			return d;
+		},
+		/**
+		 * 获取日历数组（42天）
+		 * @param date 日期对象或日期字符串
+		 * @param proc 处理日历(和forEach类似)，传递一个数组中的item
+		 * @return Array
+		 */
+		getCalendar(date, proc,beforeDateDisable) {
+			let it = new Date(date),
+				calendars = [];
+			let nowDate = new Date(new Date(new Date().toLocaleDateString()).getTime());
+			it.setDate(1);
+			if(it.getDay()>0){
+				it.setDate(it.getDate() - (it.getDay() == 0 ? 7 : it.getDay())); //偏移量
+			}
+			for (let i = 0; i < 42; i++) {
+				let tmp = {
+					dateObj: new Date(it),
+					title: it.getDate(),
+					isOtherMonth: it.getMonth() < date.getMonth() || it.getMonth() > date.getMonth() 
+				};
+				if(beforeDateDisable){
+					tmp.isBeforeNowDay = it<nowDate;
+				}
+				if (tmp.title == 1 && calendars.length > 7) {
+					break;
+				}
+				calendars.push(Object.assign(tmp, proc ? proc(tmp) : {}));
+
+				it.setDate(it.getDate() + 1);
+			}
+			return calendars;
+		},
+		/**
+		 * 获取日期到指定的月份1号(不改变原来的date对象)
+		 * @param d Date对象
+		 * @param v 指定的月份
+		 * @return Date对象
+		 */
+		getDateToMonth(d, v) {
+			let n = new Date(d);
+			n.setMonth(v, 1);
+			return n;
+		},
+		/**
+		 * 把时间数组转为时间字符串
+		 * @param t Array[时,分,秒]
+		 * @param showSecinds 是否显示秒
+		 * @return 字符串 时:分[:秒]
+		 */
+		formatTimeArray(t, s) {
+			let r = [...t];
+			if (!s) r.length = 2;
+			r.forEach((v, k) => r[k] = ('0' + v).slice(-2));
+			return r.join(':');
+		}
+	};
+
+	export default {
+		props: {
+			//颜色
+			color: {
+				type: String,
+				default: 'rgb(230,86,86)'
+			},
+			//显示未来几个月
+			beforeDateDisable: {
+				type: Boolean,
+				default: false
+			},
+			//显示未来几个月
+			monthNum: {
+				type: Number,
+				default: 6
+			},
+			//是否显示秒 针对type为datetime或time时生效
+			showSeconds: {
+				type: Boolean,
+				default: false
+			},
+			//初始的值
+			value: [String, Array],
+			//类型date time datetime range rangetime
+			type: {
+				type: String,
+				default: 'range'
+			},
+			//是否显示
+			show: {
+				type: Boolean,
+				default: false
+			},
+			//初始格式
+			format: {
+				type: String,
+				default: ''
+			},
+			//显示公历节日
+			showHoliday: {
+				type: Boolean,
+				default: true
+			},
+			//显示提示
+			showTips: {
+				type: Boolean,
+				default: false
+			},
+			//开始文案 针对type为范围选择时生效
+			beginText: {
+				type: String,
+				default: '开始'
+			},
+			//结束文案 针对type为范围选择时生效
+			endText: {
+				type: String,
+				default: '结束'
+			}
+		},
+		data() {
+			return {
+				isShow: false, //是否显示
+				isMultiSelect: false, //是否为多选
+				isContainTime: false, //是否包含时间
+				date: {}, //当前日期对象
+				weekArr: ["日", "一", "二", "三", "四", "五", "六"],
+				scrollTopArr: [],
+				scrollIndex: 0,
+				dateTitleArr: [],
+				title: '初始化', //标题
+				calendars: [], //日历数组
+				calendarIndex: 1, //当前日历索引
+				checkeds: [], //选中的日期对象集合
+				showTimePicker: false, //是否显示时间选择器
+				timeValue: [0, 0, 0], //时间选择器的值
+				timeType: 'begin', //当前时间选择的类型
+				beginTime: [0, 0, 0], //当前所选的开始时间值
+				endTime: [0, 0, 0], //当前所选的结束时间值
+			};
+		},
+		methods: {
+			//监听滚动条
+			scrollPage(e) {
+				let scrollIndex = 0;
+				if (this.scrollTopArr.length >= 6) {
+					this.scrollTopArr.some(function(item, index) {
+						if (e.detail.scrollTop >= item) {
+							scrollIndex = index;
+						}
+					})
+				}
+				this.scrollIndex = scrollIndex;
+			},
+			//设置值
+			setValue(value) {
+				this.date = new Date();
+				this.checkeds = [];
+				this.isMultiSelect = this.type.indexOf('range') >= 0;
+				this.isContainTime = this.type.indexOf('time') >= 0;
+				//将字符串解析为Date对象
+				let parseDateStr = (str) => (this.format ? DateTools.inverse(str, this.format) : DateTools.parse(str));
+				if (value) {
+					if (this.isMultiSelect) {
+						Array.isArray(value) && value.forEach((dateStr, index) => {
+							let date = parseDateStr(dateStr);
+							let time = [date.getHours(), date.getMinutes(), date.getSeconds()];
+							if (index == 0) this.beginTime = time;
+							else this.endTime = time;
+							this.checkeds.push(date);
+						});
+					} else {
+						if (this.type == 'time') {
+							let date = parseDateStr('2019/1/1 ' + value);
+							this.beginTime = [date.getHours(), date.getMinutes(), date.getSeconds()];
+							this.onShowTimePicker('begin');
+						} else {
+							this.checkeds.push(parseDateStr(value));
+							if (this.isContainTime) this.beginTime = [
+								this.checkeds[0].getHours(),
+								this.checkeds[0].getMinutes(),
+								this.checkeds[0].getSeconds()
+							];
+						}
+					}
+					if (this.checkeds.length) this.date = new Date(this.checkeds[0]);
+				} else {
+					if (this.isContainTime) {
+						this.beginTime = [this.date.getHours(), this.date.getMinutes(), this.date.getSeconds()];
+						if (this.isMultiSelect) this.endTime = [...this.beginTime];
+					}
+					this.checkeds.push(new Date(this.date));
+				}
+				if (this.type != 'time') this.refreshCalendars(true);
+				else this.onShowTimePicker('begin');
+			},
+			//设置时间选择器的显示状态
+			onShowTimePicker(type) {
+				this.showTimePicker = true;
+				this.timeType = type;
+				this.timeValue = type == 'begin' ? [...this.beginTime] : [...this.endTime];
+			},
+			//处理日历
+			procCalendar(item) {
+				//定义初始样式
+				item.statusStyle = {
+					opacity: 1,
+					color: item.isOtherMonth ? '#ddd' : 'rgb(108,108,108)',
+					background: 'transparent'
+				};
+				if(item.isBeforeNowDay || item.isOtherMonth){
+					item.statusStyle.color = '#ddd';
+					item.isGray = true;
+				}
+				item.bgStyle = {
+					type: '',
+					background: 'transparent'
+				};
+				item.dotStyle = {
+					opacity: 1,
+					background: 'transparent'
+				};
+				item.tips = "";
+				//标记今天的日期
+				if (DateTools.isSameDay(new Date(), item.dateObj)) {
+					item.statusStyle.color = this.color;
+					if (item.isOtherMonth) item.statusStyle.opacity = 0.3;
+				}
+				//标记选中项
+				this.checkeds.forEach(date => {
+					if (DateTools.isSameDay(date, item.dateObj)) {
+						item.statusStyle.background = this.color;
+						item.statusStyle.color = '#fff';
+						item.statusStyle.opacity = 1;
+						if (this.isMultiSelect && this.showTips) item.tips = this.beginText;
+					}
+				});
+				//节假日或今日的日期标点
+				if (item.statusStyle.background != this.color) {
+					let holiday = this.showHoliday ? DateTools.getHoliday(item.dateObj) : false;
+					if (holiday || DateTools.isSameDay(new Date(), item.dateObj)) {
+						item.title = holiday || item.title;
+						item.dotStyle.background = this.color;
+						if (item.isOtherMonth) item.dotStyle.opacity = 0.2;
+					}
+				} else {
+					item.title = item.dateObj.getDate();
+				}
+				//有两个日期
+				if (this.checkeds.length == 2) {
+					if (DateTools.isSameDay(this.checkeds[0], item.dateObj)) { //开始日期
+						item.bgStyle.type = 'bgbegin';
+					}
+					if (DateTools.isSameDay(this.checkeds[1], item.dateObj)) { //结束日期
+						if (this.isMultiSelect && this.showTips) item.tips = item.bgStyle.type ? this.beginText + ' / ' + this.endText :
+							this.endText;
+						if (!item.bgStyle.type) { //开始日期不等于结束日期
+							item.bgStyle.type = 'bgend';
+						} else {
+							item.bgStyle.type = '';
+						}
+					}
+					if (!item.bgStyle.type && (+item.dateObj > +this.checkeds[0] && +item.dateObj < +this.checkeds[1])) { //中间的日期
+						item.bgStyle.type = 'bg';
+						item.statusStyle.color = this.color;
+					}
+					if (item.bgStyle.type) {
+						item.bgStyle.background = this.color;
+						item.dotStyle.opacity = 1;
+						item.statusStyle.opacity = 1;
+					}
+				}
+			},
+			//刷新日历
+			refreshCalendars(refresh = false) {
+				let date = new Date(this.date);
+				let before = DateTools.getDateToMonth(date, date.getMonth() - 1);
+				let after = DateTools.getDateToMonth(date, date.getMonth() + 1);
+
+				let _this = this;
+				let mArr = [];
+				for (let m_num = 0; m_num < this.monthNum; m_num++) {
+					let new_date = DateTools.getDateToMonth(date, date.getMonth() + m_num);
+					_this.dateTitleArr.push(DateTools.format(new_date, 'yyyy年mm月'))
+					mArr.push(new_date)
+				}
+				mArr.some(function(item, index) {
+					_this.calendars.splice(index, 1, DateTools.getCalendar(item, _this.procCalendar,_this.beforeDateDisable));
+				})
+				this.title = DateTools.format(this.date, 'yyyy年mm月');
+
+				setTimeout(function(){
+					let domArr = [];
+					let h = 0;
+					const query = uni.createSelectorQuery().in(_this);
+					for (let m_domNum = 0; m_domNum < _this.monthNum; m_domNum++) {
+						let className = '#calendar_module' + m_domNum;
+						let view = uni.createSelectorQuery().select(className);
+						//console.log(view);
+						view.fields({
+							size: true, // 是否返回节点尺寸
+						}, data => { // data是方法的回调函数，参数是指定的相关节点信息。
+							// console.log(data);
+							let model = {};
+							model.top = h; // 顶部高度
+							h += data.height;
+							model.bottom = h; // 底部高度
+							domArr.push(model.top);
+						}).exec();
+					}
+					_this.scrollTopArr = domArr;
+				},100)
+			},
+			//选中日期
+			onSelectDate(date) {
+				if(date.isGray){
+					return;
+				}
+				if (~this.type.indexOf('range') && this.checkeds.length == 2) this.checkeds = [];
+				else if (!(~this.type.indexOf('range')) && this.checkeds.length) this.checkeds = [];
+				this.checkeds.push(new Date(date.dateObj));
+				this.checkeds.sort((a, b) => a - b); //从小到大排序
+				this.calendars.forEach(calendar => {
+					calendar.forEach(this.procCalendar); //重新处理
+				});
+			},
+			//时间选择取消
+			onCancelTime() {
+				this.showTimePicker = false;
+				this.type == 'time' && this.onCancel();
+			},
+			//时间选择确定
+			onConfirmTime() {
+				if (this.timeType == 'begin') this.beginTime = this.timeValue;
+				else this.endTime = this.timeValue;
+				this.showTimePicker = false;
+				this.type == 'time' && this.onConfirm();
+			},
+			//取消
+			onCancel() {
+				this.$emit('cancel', false);
+			},
+			//确定
+			onConfirm() {
+				let result = {
+					value: null,
+					date: null
+				};
+				//定义默认格式
+				let defaultFormat = {
+					'date': 'yyyy/mm/dd',
+					'time': 'hh:ii' + (this.showSeconds ? ':ss' : ''),
+					'datetime': ''
+				};
+				defaultFormat['datetime'] = defaultFormat.date + ' ' + defaultFormat.time;
+				let fillTime = (date, timeArr) => {
+					date.setHours(timeArr[0], timeArr[1]);
+					if (this.showSeconds) date.setSeconds(timeArr[2]);
+				};
+				if (this.type == 'time') {
+					let date = new Date();
+					fillTime(date, this.beginTime);
+					result.value = DateTools.format(date, this.format ? this.format : defaultFormat.time);
+					result.date = date;
+				} else {
+					if (this.isMultiSelect) {
+						let values = [],
+							dates = [];
+						if (this.checkeds.length < 2) return uni.showToast({
+							icon: 'none',
+							title: '请选择两个日期'
+						});
+						this.checkeds.forEach((date, index) => {
+							let newDate = new Date(date);
+							if (this.isContainTime) {
+								let time = [this.beginTime, this.endTime];
+								fillTime(newDate, time[index]);
+							}
+							values.push(DateTools.format(newDate, this.format ? this.format : defaultFormat[this.isContainTime ?
+								'datetime' : 'date']));
+							dates.push(newDate);
+						});
+						result.value = values;
+						result.date = dates;
+					} else {
+						let newDate = new Date(this.checkeds[0]);
+						if (this.isContainTime) {
+							newDate.setHours(this.beginTime[0], this.beginTime[1]);
+							if (this.showSeconds) newDate.setSeconds(this.beginTime[2]);
+						}
+						result.value = DateTools.format(newDate, this.format ? this.format : defaultFormat[this.isContainTime ?
+							'datetime' : 'date']);
+						result.date = newDate;
+					}
+				}
+				this.$emit('confirm', result);
+			}
+		},
+		computed: {
+			BeginTitle() {
+				let value = '未选择';
+				if (this.checkeds.length) value = DateTools.format(this.checkeds[0], 'yy/mm/dd');
+				return value;
+			},
+			EndTitle() {
+				let value = '未选择';
+				if (this.checkeds.length == 2) value = DateTools.format(this.checkeds[1], 'yy/mm/dd');
+				return value;
+			}
+		},
+		watch: {
+			show(newValue, oldValue) {
+				newValue && this.setValue(this.value);
+				this.isShow = newValue;
+			},
+			value(newValue, oldValue) {
+				setTimeout(() => {
+					this.setValue(newValue);
+				}, 0);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.close {
+		position: relative;
+		width: 35upx;
+		height: 35upx;
+	}
+
+	.close::before,
+	.close::after {
+		position: absolute;
+		content: ' ';
+		background-color: rgb(101, 100, 91);
+		left: 20upx;
+		width: 1px;
+		height: 35upx;
+	}
+
+	.close::before {
+		transform: rotate(45deg);
+	}
+
+	.close::after {
+		transform: rotate(-45deg);
+	}
+	
+	
+	@keyframes myfirst
+	{
+		0% {top: 100vh;}
+		100% {top: 30vh;}
+	}
+	
+	@-moz-keyframes myfirst /* Firefox */
+	{
+		0% {top: 100vh;}
+		100% {top: 30vh;}
+	}
+	
+	@-webkit-keyframes myfirst /* Safari 和 Chrome */
+	{
+		0% {top: 100vh;}
+		100% {top: 30vh;}
+	}
+	
+	@-o-keyframes myfirst /* Opera */
+	{
+		0% {top: 100vh;}
+		100% {top: 30vh;}
+	}
+
+
+
+	$z-index: 100;
+	$cell-spacing: 20upx;
+	$calendar-size: 630upx;
+	$calendar-item-size: 100upx;
+
+	.picker {
+		position: fixed;
+		z-index: $z-index;
+		background: rgba(60, 60, 60, 0);
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		font-size: 28upx;
+
+		&-header {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			padding: 20upx 30upx;
+			box-sizing: border-box;
+		}
+
+		&-week-header {
+			font-size: 16px;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			border-bottom: 2px solid rgb(244, 244, 244);
+			padding: 10px 20px;
+			color: rgb(136, 136, 136);
+			font-size: 14px;
+		}
+
+		&-week-header>view:first-child {
+			color: rgb(214, 142, 135);
+		}
+
+		&-week-header>view:last-child {
+			color: rgb(214, 142, 135);
+		}
+
+		&-btn {
+			padding: $cell-spacing*0.5 $cell-spacing;
+			border-radius: 12upx;
+			color: #666;
+
+			&-active {
+				background: rgba(0, 0, 0, .1);
+			}
+		}
+
+		&-display {
+			color: #666;
+
+			&-text {
+				color: #000;
+				margin: 0 $cell-spacing*0.5;
+			}
+
+			&-link {
+				display: inline-block;
+
+				&-active {
+					background: rgba(0, 0, 0, .1);
+				}
+			}
+		}
+
+		&-time {
+			width: 100%; //$calendar-size - 80upx !important;
+			left: ((750upx - $calendar-size) / 2 + 40upx) !important;
+		}
+
+		&-modal {
+			background: #fff;
+			box-sizing: border-box;
+			position: fixed;
+			bottom: 0;
+			left: 0; //(750upx - $calendar-size) / 2;
+			width: 100%; //$calendar-size;
+			box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.1);
+			border-radius: 12upx;
+
+			display: flex;
+			flex-direction: column;
+			justify-content: flex-start;
+			height: 70vh;
+			
+			
+			animation: myfirst 0.5s;
+			-moz-animation: myfirst 0.5s;	/* Firefox */
+			-webkit-animation: myfirst 0.5s;	/* Safari 和 Chrome */
+			-o-animation: myfirst 0.5s;	/* Opera */
+			
+
+			&-header {
+				text-align: center;
+				line-height: 80upx;
+				font-size: 32upx;
+
+				&-title {
+					display: inline-block;
+					width: 40%;
+					color: rgb(77, 77, 77);
+					font-size: 16px;
+					width: 100%;
+					height: 90upx;
+					line-height: 90upx;
+					text-align: center;
+					border-bottom: 1px solid rgb(244, 244, 244);
+				}
+
+				.picker-icon {
+					display: inline-block;
+					line-height: 50upx;
+					width: 50upx;
+					height: 50upx;
+					border-radius: 50upx;
+					text-align: center;
+					margin: 10upx;
+					background: #fff;
+					font-size: 36upx;
+
+					&-active {
+						background: rgba(0, 0, 0, .1);
+					}
+				}
+			}
+
+			&-body {
+				width: 100%; //$calendar-size !important;
+				position: relative;
+				overflow: auto;
+			}
+
+			&-time {
+				width: 100%;
+				height: 180upx;
+				text-align: center;
+				line-height: 60upx;
+			}
+
+			&-footer {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: $cell-spacing;
+				height: 130upx;
+				width: 100%;
+				box-sizing: border-box;
+				border-top: 1px solid rgb(244, 244, 244);
+
+				&-btnOK {
+					width: calc(100% - 100upx);
+					height: 100%;
+					margin: 0 auto;
+					border-radius: 6upx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 16px;
+					color: #fff;
+				}
+
+				&-info {
+					flex-grow: 1;
+				}
+
+				&-btn {
+					flex-shrink: 0;
+					display: flex;
+				}
+			}
+		}
+
+		&-calendar {
+			width: 100%;
+			height: calc(100% - 90upx);
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			flex-wrap: wrap;
+			flex-direction: row;
+
+			&-box {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				flex-wrap: wrap;
+			}
+			&-view:nth-child(7n){
+				width: 14.2%;
+			}
+			&-view {
+				position: relative;
+				width: 14.3%; //$calendar-item-size;
+				height: $calendar-item-size;
+				text-align: center;
+
+				&-bgbegin,
+				&-bg,
+				&-bgend,
+				&-item,
+				&-dot,
+				&-tips {
+					position: absolute;
+					transition: .2s;
+				}
+
+				&-bgbegin,
+				&-bg,
+				&-bgend {
+					opacity: .15;
+					height: 100%;
+				}
+
+				&-bg {
+					left: 0;
+					top: 0%;
+					width: 100%;
+				}
+
+				&-bgbegin {
+					border-radius: $calendar-item-size 0 0 $calendar-item-size;
+					top: 0%;
+					left: 0%;
+					width: 100%;
+				}
+
+				&-bgend {
+					border-radius: 0 $calendar-item-size $calendar-item-size 0;
+					top: 0%;
+					left: 0%;
+					width: 100%;
+				}
+
+				&-item {
+					left: 0%;
+					top: 0%;
+					width: 100%;
+					height: 100%;
+					border-radius: 5px;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+
+				&-dot {
+					right: 10%;
+					top: 10%;
+					width: 12upx;
+					height: 12upx;
+					border-radius: 12upx;
+				}
+
+				&-tips {
+					bottom: 100%;
+					left: 50%;
+					transform: translateX(-50%);
+					background: #4E4B46;
+					color: #fff;
+					border-radius: 12upx;
+					padding: 10upx 20upx;
+					font-size: 24upx;
+					width: max-content;
+					margin-bottom: 5px;
+					pointer-events: none;
+					z-index: 1000;
+
+					&:after {
+						content: "";
+						position: absolute;
+						top: 100%;
+						left: 50%;
+						transform: translateX(-50%);
+						width: 0;
+						height: 0;
+						border-style: solid;
+						border-width: 5px 5px 0 5px;
+						border-color: #4E4B46 transparent transparent transparent;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages.json b/pages.json
index 88a66b5..100cc80 100644
--- a/pages.json
+++ b/pages.json
@@ -1,24 +1,121 @@
 {
 	"pages": [{
-		"path": "pages/index/index"
+		"path": "pages/index/index",
+		"name": "Index",
+		"style": {
+			"navigationBarTitleText":"发现能量"
+		}
 	}, {
-		"path": "pages/found/index"
+		"path": "pages/found/index",
+		"name": "Found",
+		"style": {
+			"navigationBarTitleText":"发现更多"
+		}
 	}, {
-		"path": "pages/user/index"
+		"path": "pages/user/index",
+		"name": "User",
+		"style": {
+			"navigationBarTitleText":"节点中心"
+		}
+	}, {
+		"path": "pages/instrument/basics",
+		"name": "instrumentBasics",
+		"style": {
+			"navigationBarTitleText":"企业基础信息"
+		}
+	}, {
+		"path": "pages/goods/management",
+		"name": "goodsManagement",
+		"style": {
+			"navigationBarTitleText":"商品权证管理"
+		}
+	}, {
+		"path": "pages/goods/addClassify",
+		"name": "goodsaddClassify",
+		"style": {
+			"navigationBarTitleText":"发布商品类目"
+		}
+	}, {
+		"path": "pages/goods/add",
+		"name": "goodsAdd",
+		"style": {
+			"navigationBarTitleText":"商品权证创建"
+		}
+	}, {
+		"path": "pages/goods/goodsAuth",
+		"name": "goodsAddAuth",
+		"style": {
+			"navigationBarTitleText":"商品权证认证"
+		}
+	}, {
+		"path": "pages/coupons/management",
+		"name": "couponsManagement",
+		"style": {
+			"navigationBarTitleText":"创建优惠券"
+		}
+	}, {
+		"path": "pages/coupons/add",
+		"name": "couponsAdd",
+		"style": {
+			"navigationBarTitleText":"创建优惠券"
+		}
+	}, {
+		"path": "pages/coupons/magDetails",
+		"name": "couponsDetails",
+		"style": {
+			"navigationBarTitleText":"优惠券管理"
+		}
+	}, {
+		"path": "pages/coupons/selectGoods",
+		"name": "couponsSelectGoods",
+		"style": {
+			"navigationBarTitleText":"关联产品"
+		}
+	},{
+		"path": "pages/setting/setting",
+		"name": "setting",
+		"style": {
+			"navigationBarTitleText":"设置中心"
+		}
+	},{
+		"path": "pages/setting/aboutUs",
+		"name": "aboutUs",
+		"auth": true,
+		"style": {
+			"navigationBarTitleText":"关于我们"
+		}
+	},{
+		"path": "pages/login/login",
+		"name": "Login",
+		"style": {
+			"navigationBarTitleText":"登录页面"
+		}
 	}],
 	"globalStyle": {
 		"navigationStyle": "custom",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#F5F5F5"
 	},
-	"tabBar": {
+	"tabBar": {
+		"borderStyle": "white",
+		"backgroundColor": "#FFFFFF",
+		"selectedColor" : "#774ffd",
+		"iconWidth":"26px",
+		"spacing": "0",
+		"height":"60px",
 		"list": [{
-			"text": "发现能量",
+			"text": "发现能量",
+			"iconPath":"static/tabBar/tabBar_icon_00.png",
+			"selectedIconPath":"static/tabBar/tabBar_show_00.png",
 			"pagePath": "pages/index/index"
 		}, {
-			"text": "发现更多",
+			"text": "发现更多",
+			"iconPath":"static/tabBar/tabBar_icon_01.png",
+			"selectedIconPath":"static/tabBar/tabBar_show_01.png",
 			"pagePath": "pages/found/index"
 		}, {
-			"text": "节点中心",
+			"text": "节点中心",
+			"iconPath":"static/tabBar/tabBar_icon_02.png",
+			"selectedIconPath":"static/tabBar/tabBar_show_02.png",
 			"pagePath": "pages/user/index"
 		}]
 	},
diff --git a/pages/certification/personal.vue b/pages/certification/personal.vue
new file mode 100644
index 0000000..388b9a8
--- /dev/null
+++ b/pages/certification/personal.vue
@@ -0,0 +1,222 @@
+<template>
+	<view>
+		<!-- 副标题 -->
+		<view class="sub-title">
+			<text>请正确填写你的个人身份信息</text>
+		</view>
+		<!-- 填写姓名 -->
+		<view class="password">
+			<view class="group">
+				<view class="inputs">
+					<label>真实姓名</label>
+					<input type="text" v-model="nikcName" placeholder="请输入您的真实姓名" />
+				</view>
+				<view class="inputs">
+					<label>身份证件号</label>
+					<input type="idcard" v-model="idcardNo" placeholder="请输入身份证件号码" />
+				</view>
+			</view>
+		</view>
+		<!-- 上传证件号 -->
+		<view class="idcard-flex">
+			<view class="idcard-item">
+				<view class="idcard-title">
+					<text>上传身份证正面</text>
+				</view>
+				<view class="idcard-block positive">
+					<image :src="positive" mode="aspectFit" @click="upload('positive')"/>
+				</view>
+			</view>
+			<view class="idcard-item">
+				<view class="idcard-title">
+					<text>上传身份证背面</text>
+				</view>
+				<view class="idcard-block reverse">
+					<image :src="reverse" mode="aspectFit" @click="upload('reverse')" />
+				</view>
+			</view>
+		</view>
+		<!-- 按钮 -->
+		<view class="buttons">
+			<button type="default" @click="submitPersonal">提交认证信息</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	// import uploading from '@/apis/oss'
+	import { personal } from '@/apis/interfaces/certification'
+	export default {
+		data() {
+			return {
+				positive: '',
+				reverse: '',
+				nikcName: '',
+				idcardNo: ''
+			}
+		},
+		mounted() {
+			
+		},
+		methods: {
+			// 创建钱包
+			submitPersonal(){
+				if(this.nikcName === '' || this.idcardNo === ''){
+					uni.showToast({
+						icon: 'none',
+						title: '真实姓名或身份证号不能为空'
+					})
+					return
+				}
+				personal({
+					name: this.nikcName,
+					id_card: this.idcardNo
+				}).then(res=>{
+					uni.showModal({
+						title: '提示',
+						content: '您的身份认证已完成，是否立即激活钱包~',
+						confirmText: '立即激活',
+						confirmColor: '#009B69',
+						cancelColor: '#666666',
+						cancelText: '稍后激活',
+						success: res=> {
+							if(res.confirm) {
+								uni.redirectTo({
+									url: '../wallet/mnemonic'
+								})
+							}
+							if(res.cancel) {
+								uni.navigateBack()
+							}
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						icon: 'none',
+						title: err.message
+					})
+				})
+			},
+			// 上传身份证
+			upload(type){
+				uni.chooseImage({
+					success(files){
+						uni.showToast({
+							icon: 'none',
+							title: '暂未开放'
+						})
+						// let filesArr = files.tempFilePaths.map(val => {
+						// 	return {
+						// 		uri: val
+						// 	}
+						// })
+						// uploading(filesArr)
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	// 副标题
+	.sub-title{
+		color: $text-gray;
+		text-align: center;
+		margin: $margin * 2 $margin;
+		font-size: $title-size-m;
+	}
+	// 上传证件
+	.idcard-flex{
+		display: flex;
+		padding: ($padding*2) $padding 0;
+		.idcard-item{
+			margin: 0 $margin;
+			width: calc(50% - #{$margin * 2});
+			.idcard-title{
+				text-align: center;
+				color: $text-gray;
+				font-size: $title-size-m;
+				padding-bottom: $padding;
+			}
+			.idcard-block{
+				position: relative;
+				border-radius: $radius-m;
+				box-shadow: 0 0 4rpx 4rpx rgba($color: $text-color, $alpha: .02);
+				background-color: white;
+				padding-top: 63%;
+				background-position: center;
+				background-size: 36%;
+				background-repeat: no-repeat;
+				overflow: hidden;
+				&.positive{
+					background-image: url(../../static/background/idcard-positive.png);
+				}
+				&.reverse{
+					background-image: url(../../static/background/idcard-reverse.png);
+				}
+				image{
+					position: absolute;
+					top: 0;
+					left: 0;
+					height: 100%;
+					width: 100%;
+					z-index: 1;
+				}
+			}
+		}
+	}
+	// 身份信息
+	.password{
+		padding: 0 $padding * 2;
+		.prompt{
+			margin-top: $margin * 2;
+			font-size: $title-size-m;
+			color: $mian-color;
+		}
+		.group{
+			margin-top: $margin;
+			border-radius: $radius-m;
+			box-shadow: 0 0 4rpx 4rpx rgba($color: $text-color, $alpha: .02);
+			background-color: white;
+			.inputs{
+				padding: $padding $padding + 10;
+				border-bottom: solid 1rpx $border-color;
+				&:last-child{
+					border-bottom: none;
+				}
+				label{
+					color: $text-gray;
+					font-size: $title-size-m;
+				}
+				input{
+					height: 70rpx;
+					line-height: 70rpx;
+					font-size: $title-size;
+				}
+			}
+		}
+	}
+	// 按钮
+	.buttons{
+		padding: $padding * 2;
+		.text{
+			text-align: center;
+			line-height: 90rpx;
+			height: 90rpx;
+			margin-bottom: $margin * 2;
+			font-size: $title-size-lg;
+			color: $mian-color;
+			font-weight: bold;
+		}
+		button{
+			height: 90rpx;
+			line-height: 90rpx;
+			background-color: $mian-color;
+			border-radius: $radius-lg;
+			color: white;
+			font-weight: bold;
+			font-size: $title-size;
+		}
+	}
+</style>
diff --git a/pages/company/approve.vue b/pages/company/approve.vue
new file mode 100644
index 0000000..1ecab2f
--- /dev/null
+++ b/pages/company/approve.vue
@@ -0,0 +1,359 @@
+<template>
+	<view class="content">
+		<view class="header">
+			<view class="title">企业认证</view>
+			<view class="subtitle">请如实填写认证信息，快速审核开店</view>
+		</view>
+		<view class="white-box">
+			<view class="inputs logo">
+				<label>企业LOGO</label>
+				<image class="logo-cover" :src="logo.showpath || require('@/static/icons/add-icon.png')" @click="updImg('logo')" mode="aspectFill"></image>
+			</view>
+			<view class="inputs">
+				<label>企业名称</label>
+				<input type="text" v-model="name" placeholder="输入企业名称" />
+			</view>
+			<view class="inputs">
+				<label>企业行业</label>
+				<picker v-if="industry.length > 0" :range="industry" :value="industryIndex" range-key="title" @change="changePicker" data-type="industry">
+					<view class="picker-text nowrap">
+						{{industry[industryIndex].title}}
+						<uni-icons class="picker-icon" type="arrowdown"></uni-icons>
+					</view>
+				</picker>
+			</view>
+			<view class="inputs">
+				<label>经营类目</label>
+				<view class="picker-text nowrap" @click="opnePopup">
+					<block v-if="categorys.length > 0">
+						<text class="text-item" v-for="(item, index) in category" :key="index" v-if="item.check">{{item.name}}</text>
+					</block>
+					<block v-else>选择经营类目</block>
+					<uni-icons class="picker-icon" type="arrowdown"></uni-icons>
+				</view>
+			</view>
+			<view class="inputs">
+				<label>法人姓名</label>
+				<input type="text" v-model="corporate" placeholder="输入法人姓名" />
+			</view>
+			<view class="inputs">
+				<label>法人身份证</label>
+				<input type="text" v-model="identity" placeholder="输入法人身份证" />
+			</view>
+			<view class="inputs">
+				<label>机构代码</label>
+				<input type="text" v-model="org" placeholder="输入企业组织机构代码" />
+			</view>
+			<view class="inputs logo">
+				<label>营业执照</label>
+				<image class="license-cover" :src="license.showpath || require('@/static/icons/add-icon.png')" @click="updImg('license')" mode="aspectFill"></image>
+			</view>
+			<view class="btns">
+				<button type="default" size="default" @click="submitApplies">提交认证</button>
+			</view>
+		</view>
+		<!-- 经营类目 -->
+		<uni-popup ref="categoryPopup">
+			<view class="category-popup">
+				<view class="header">
+					<view class="title">经营类目</view>
+					<view class="subtitle">请选择经营类目</view>
+				</view>
+				<view class="category-flex">
+					<view class="category-flex-item" :class="{'show' : item.check}" v-for="(item, index) in category" :key="index" @click="item.check = !item.check">{{item.name}}</view>
+				</view>
+				<view class="btns">
+					<button type="default" size="default" @click="affirmCategory">确定</button>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import { appliesCreate, applies, appliesInfo, appliesCategory } from '@/apis/interfaces/company'
+	import { uploads } from '@/apis/interfaces/uploading'
+	export default {
+		data() {
+			return {
+				formType	 : "",
+				name		 : "",
+				corporate	 : "",
+				identity	 : "",
+				org			 : "",
+				logo		 : {
+					showpath: '',
+					path	: ''
+				},
+				license		 : {
+					showpath: '',
+					path	: ''
+				},
+				industry	 : [],
+				industryIndex: 0,
+				reason		 : '',
+				category	 : [],
+				categorys	 : []
+			};
+		},
+		created(){
+			// 读取配置信息
+			appliesCreate().then(res=>{
+				console.log(res)
+				this.industry 		= res.industries
+				this.formType		= this.$Route.query.formType
+				this.name	  		= res.info.name
+				this.industryIndex	= res.industries.findIndex(val => val.industry_id === res.info.industry.industry_id) || 0
+				if(this.formType === 'put'){
+					appliesInfo().then(formValue => {
+						for(let val of formValue.categories){
+							if(val.check){
+								this.categorys.push(val.category_id)
+							}
+						}
+						this.category  = formValue.categories
+						this.corporate = formValue.certification.name
+						this.identity  = formValue.certification.idcard
+						this.org	   = formValue.certification.code
+						this.logo	   = formValue.cover
+						this.license   = formValue.certification.license
+					}).catch(valueErr => {
+						uni.showToast({
+							title: valueErr.message,
+							icon : 'none'
+						})
+					})
+				}else{
+					this.category = res.info.categories
+				}
+			}).catch(err =>{
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		methods:{
+			// 选择经营类目
+			opnePopup(){
+				this.$refs.categoryPopup.open('bottom')
+			},
+			// 确认选择类目
+			affirmCategory(){
+				this.categorys = []
+				for(let val of this.category){
+					if(val.check){
+						this.categorys.push(val.category_id)
+					}
+				}
+				this.$refs.categoryPopup.close()
+			},
+			// 提交信息
+			submitApplies(){
+				let method = this.formType === 'put' ? 'PUT' : 'POST'
+				applies({
+					name		: this.name,
+					cover		: this.logo.path,
+					license		: this.license.path,
+					user_name	: this.corporate,
+					id_card		: this.identity,
+					code		: this.org,
+					industry_id	: this.industry[this.industryIndex].industry_id,
+					categories	: this.categorys
+				}, method).then(res => {
+					uni.showModal({
+						title		: '提示',
+						content		: '您的企业认证信息已提交，审核需3-7个工作日，请耐心等待',
+						showCancel	: false,
+						confirmText : '确认',
+						success		: resModal => {
+							this.$Router.back()
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			
+			// 选择器
+			changePicker(e){
+				this.industryIndex = e.detail.value
+				appliesCategory({
+					industry: this.industry[e.detail.value].industry_id,
+				}).then(res => {
+					this.category = res
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			
+			// 上传图片
+			updImg(type){
+				uni.chooseImage({
+					count	: 1,
+					success	: path => {
+						uploads([{
+							uri : path.tempFilePaths[0]
+						}]).then(res => {
+							this[type] = {
+								showpath: res.url[0],
+								path: res.path[0]
+							}
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon : 'none'
+							})
+						})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	// 内容
+	.content{
+		.header{
+			height: 15vh;
+			padding-bottom: $padding * 2;
+			box-sizing: border-box;
+			@extend .vertical;
+			.title{
+				text-align: center;
+				font-size: $title-size + 14;
+				font-weight: bold;
+				line-height: 90rpx;
+			}
+			.subtitle{
+				font-size: $title-size-m;
+				color: $text-gray;
+				text-align: center;
+			}
+		}
+		.white-box{
+			background-color: white;
+			border-radius: $radius $radius 0 0;
+			min-height: 85vh;
+			padding: $padding $padding * 2 $padding * 2;
+			box-sizing: border-box;
+			.inputs{
+				position: relative;
+				margin-top: $margin;
+				background: white;
+				border-bottom: solid 1rpx $border-color;
+				padding-left: 200rpx;
+				line-height: 90rpx;
+				min-height: 90rpx;
+				label{
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 200rpx;
+					font-size: $title-size;
+				}
+				input{
+					height: 90rpx;
+					line-height: 90rpx;
+					font-size: $title-size;
+				}
+				.picker-text{
+					position: relative;
+					padding-right: 90rpx;
+					.picker-icon{
+						position: absolute;
+						right: 0;
+						top: 0;
+					}
+					.text-item{
+						margin-left: 10rpx;
+						&:first-child{
+							margin-left: 0;
+						}
+					}
+				}
+			}
+			.logo{
+				min-height: 98rpx;
+				padding-bottom: $padding;
+				.logo-cover{
+					position: absolute;
+					right: 0;
+					top: 0;
+					width: 98rpx;
+					height: 98rpx;
+					background: $border-color-lg;
+					border-radius: 50%;
+				}
+				.license-cover{
+					@extend .logo-cover;
+					border-radius: 0;
+					width: 131rpx;
+				}
+			}
+			.btns{
+				padding-top: $padding * 2;
+				button{
+					background: $text-price;
+					border-radius: 0;
+					height: 90rpx;
+					line-height: 90rpx;
+					font-size: $title-size;
+					color: white;
+					font-weight: bold;
+					&::after{
+						border: none;
+					}
+				}
+			}
+		}
+		// 经营类目
+		.category-popup{
+			background: #F5F5F5;
+			padding: 0 $padding * 2 $padding * 2 $padding * 2;
+			.header{
+				padding-bottom: $padding;
+			}
+			.category-flex{
+				margin: 0 -10rpx;
+				display: flex;
+				flex-wrap: wrap;
+				.category-flex-item{
+					margin: 10rpx;
+					background: white;
+					width: calc(33.33% - 20rpx);
+					line-height: 90rpx;
+					text-align: center;
+					font-size: $title-size-m;
+					@extend .nowrap;
+					&.show{
+						color: white;
+						background-color: $text-price;
+					}
+				}
+			}
+			.btns{
+				padding-top: $padding * 2;
+				button{
+					background: $text-price;
+					border-radius: 0;
+					height: 90rpx;
+					line-height: 90rpx;
+					font-size: $title-size;
+					color: white;
+					font-weight: bold;
+					&::after{
+						border: none;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/company/prompt.vue b/pages/company/prompt.vue
new file mode 100644
index 0000000..f10878e
--- /dev/null
+++ b/pages/company/prompt.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="content">
+		<image class="cover" src="@/static/dev/guide_cover_00.png" mode="widthFix"></image>
+		<view class="title">恭喜您，已注册成功</view>
+		<view class="sub-title">开通会员认证企业信息立即获得授信易货额，即可开始易货之旅</view>
+		<button class="vip-button" type="default" @click="$Router.push({name: 'Vip'})">开通会员</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		},
+		onNavigationBarButtonTap(e){
+			this.$Router.pushTab({name: "Equity"})
+		},
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		padding: $padding * 2;
+		background: white;
+		height: 100vh;
+		width: 100vw;
+		box-sizing: border-box;
+		@extend .vertical;
+		text-align: center;
+		.cover{
+			width: 46vw;
+			margin-bottom: 10vh;
+		}
+		.title{
+			font-size: $title-size + 14;
+			font-weight: bold;
+			line-height: 90rpx;
+		}
+		.sub-title{
+			font-size: $title-size-m;
+			color: $text-gray;
+			text-align: center;
+		}
+		
+		.vip-button{
+			margin-top: 10vh;
+			background: $text-price;
+			border-radius: 0;
+			height: 90rpx;
+			line-height: 90rpx;
+			font-size: $title-size;
+			color: white;
+			font-weight: bold;
+			&::after{
+				border: none;
+			}
+		}
+	}
+</style>
diff --git a/pages/company/registered.vue b/pages/company/registered.vue
new file mode 100644
index 0000000..2d8e453
--- /dev/null
+++ b/pages/company/registered.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="content">
+		<view class="header">
+			<view class="title">企业注册</view>
+			<view class="subtitle">填写企业基础行业，获取企业/商家权益</view>
+		</view>
+		<view class="white-box">
+			<view class="inputs">
+				<label>企业名称</label>
+				<input type="text" v-model="name" placeholder="输入企业名称" />
+			</view>
+			<view class="inputs">
+				<label>企业行业</label>
+				<picker v-if="industry.length > 0" :range="industry" :value="industryIndex" range-key="title" @change="changePicker" data-type="industry">
+					<view class="picker-text nowrap">
+						{{industry[industryIndex].title}}
+						<uni-icons class="picker-icon" type="arrowdown"></uni-icons>
+					</view>
+				</picker>
+			</view>
+			<view class="btns">
+				<button type="default" size="default" @click="next">下一步</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { createConfig, inits } from '@/apis/interfaces/company'
+	export default {
+		data() {
+			return {
+				name		 : "",
+				industry	 : [],
+				industryIndex: 0
+			};
+		},
+		created(){
+			createConfig().then(res=>{
+				this.industry = res
+			})
+		},
+		methods:{
+			// 提交信息
+			next(){
+				inits({
+					name		: this.name,
+					industry_id	: this.industry[this.industryIndex].industry_id
+				}).then(res => {
+					this.$Router.push({name: 'Prompt'})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			
+			//选择器
+			changePicker(e){
+				let changeType = e.target.dataset.type,
+					changeVlae = e.detail.value
+
+				switch(changeType){
+					case 'type':
+						this.typeIndex = changeVlae
+						break
+					case 'industry':
+						this.industryIndex = changeVlae
+						break
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		.header{
+			height: 20vh;
+			@extend .vertical;
+			.title{
+				text-align: center;
+				font-size: $title-size + 14;
+				font-weight: bold;
+				line-height: 90rpx;
+			}
+			.subtitle{
+				font-size: $title-size-m;
+				color: $text-gray;
+				text-align: center;
+			}
+		}
+		.white-box{
+			background-color: white;
+			border-radius: $radius $radius 0 0;
+			min-height: 80vh;
+			padding: $padding * 2;
+			box-sizing: border-box;
+			.inputs{
+				position: relative;
+				margin-top: $margin;
+				background: white;
+				border-bottom: solid 1rpx $border-color;
+				padding-left: 200rpx;
+				line-height: 90rpx;
+				min-height: 90rpx;
+				label{
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 200rpx;
+					font-size: $title-size;
+				}
+				input{
+					height: 90rpx;
+					line-height: 90rpx;
+					font-size: $title-size;
+				}
+				.picker-text{
+					position: relative;
+					padding-right: 90rpx;
+					.picker-icon{
+						position: absolute;
+						right: 0;
+						top: 0;
+					}
+				}
+			}
+			.btns{
+				padding-top: $padding * 2;
+				button{
+					background: $text-price;
+					border-radius: 0;
+					height: 90rpx;
+					line-height: 90rpx;
+					font-size: $title-size;
+					color: white;
+					font-weight: bold;
+					&::after{
+						border: none;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/coupons/add.vue b/pages/coupons/add.vue
new file mode 100644
index 0000000..fda1462
--- /dev/null
+++ b/pages/coupons/add.vue
@@ -0,0 +1,413 @@
+<template>
+	<view>
+		<view class="coupons-preview">
+			<view class="item cover">
+				<view v-if="types[typeIndex].id == 2">
+					<view class="cover-price">{{price || 0}}<text>元</text></view>
+					<view class="cover-subtitle">代金券</view>
+				</view>
+				<view @click="updCover" v-else>
+					<image class="cover-img" v-if="cover != ''" :src="cover" mode="aspectFill" />
+					<image class="cover-img" v-else src="@/static/icons/add-icon.png" mode="aspectFill" />
+				</view>
+			</view>
+			<view class="item mian">
+				<view class="title nowrap">{{couponsTitle || '优惠券标题'}}</view>
+				<block v-if="timeIndex == 0">
+					<view class="time nowrap">{{datePickerValue.length == 0 ? '有效期': datePickerValue[0] + ' 至 ' + datePickerValue[1]}}</view>
+				</block>
+				<block v-else>
+					<view class="time nowrap">领取后{{timeNumber}}天内有效</view>
+				</block>
+			</view>
+		</view>
+		<view class="add-info">
+			<view class="inputs">
+				<label class="input-label">券类型</label>
+				<picker :range="types" range-key="text" :value="typeIndex" data-type="typeIndex" @change="changePicker">
+					<view class="input-text">{{types[typeIndex].text}}<uni-icons class="picker-icon" type="arrowdown" size="14" /></view>
+				</picker>
+			</view>
+			<view class="inputs">
+				<label class="input-label">券标题</label>
+				<input type="text" v-model="couponsTitle" placeholder="输入优惠券标题" />
+			</view>
+			<view class="inputs">
+				<label class="input-label">发券数量</label>
+				<view class="input-number">
+					<uni-number-box class="number" :min="1" :max="9999" :value="quantity" @change="quantityChange"></uni-number-box>
+				</view>
+			</view>
+			<view class="inputs">
+				<label class="input-label">每人限领</label>
+				<view class="input-number">
+					<uni-number-box class="number" :min="1" :max="quantity" :value="personQuantity" @change="personQuantityChange"></uni-number-box>
+				</view>
+			</view>
+			<block v-if="types[typeIndex].id == 2">
+				<view class="inputs">
+					<label class="input-label">满</label>
+					<input type="digit" v-model="full" placeholder="输入券最低消费金额" />
+				</view>
+				<view class="inputs">
+					<label class="input-label">减</label>
+					<input type="digit" v-model="price" placeholder="输入券优惠金额" />
+				</view>
+				<view class="inputs">
+					<label class="input-label">使用渠道</label>
+					<view class="input-checkbox">
+						<radio-group @change="radioChange">
+							<label class="input-checkbox-item">
+								<radio color="#e93340" value="1" checked/>
+								<text>线上优惠</text>
+							</label>
+							<label class="input-checkbox-item">
+								<radio color="#e93340" value="2"/>
+								<text>线下活动</text>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+			</block>
+			<view class="inputs">
+				<label class="input-label">时间类型</label>
+				<picker :range="times" range-key="text" :value="timeIndex" data-type="timeIndex" @change="changePicker">
+					<view class="input-text">{{times[timeIndex].text}}<uni-icons class="picker-icon" type="arrowdown" size="14" /></view>
+				</picker>
+			</view>
+			<view class="inputs">
+				<label class="input-label">{{timeIndex == 0 ? '券有效期': '延期天数'}}</label>
+				<block v-if="timeIndex === 0">
+					<view class="input-text" @click="showDatePicker = true">{{datePickerValue.length == 0 ? '选择优惠券有效期区间': datePickerValue[0] + ' 至 ' + datePickerValue[1]}}<uni-icons class="picker-icon" type="arrowdown" size="14" /></view>
+					<tn-date-picker :show="showDatePicker" :monthNum="12" color="#e93340" :showTips="true" beginText="开始日期" endText="结束日期" @confirm="confirmDatePicker" @cancel="showDatePicker = false"/>
+				</block>
+				<block v-if="timeIndex === 1">
+					<view class="input-number">
+						<uni-number-box class="number" :min="1" :value="timeNumber" @change="timeNumberChange"></uni-number-box>
+					</view>
+				</block>
+			</view>
+			<view class="inputs">
+				<label class="input-label">关联商品</label>
+				<view class="input-text" @click="onSelectGoods">
+					<block v-if="coupongoods.length > 0">已关联{{coupongoods.length}}件商品</block>
+					<block v-else>选择关联商品</block>
+					<uni-icons class="picker-icon" type="arrowdown" size="14" />
+				</view>
+			</view>
+		</view>
+		<view class="add-textarea">
+			<label>使用规则</label>
+			<textarea :maxlength="-1" v-model="description" placeholder="输入使用规则说明" />
+		</view>
+		<view class="add-btn ios-bottom">
+			<button type="default" @click="updComponent">发布优惠券</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import TnDatePicker from "@/components/tn-datepicker/tn-datepicker";
+	import { uploads } from '@/apis/interfaces/uploading'
+	import { pushCoupons } from '@/apis/interfaces/coupons'
+	export default {
+		components:{
+			TnDatePicker
+		},
+		data() {
+			return {
+				typeIndex		: 0,
+				types			: [
+					{ id: 1, text: '服务券' },
+					{ id: 2, text: '代金券' },
+					{ id: 3, text: '提货券' },
+				],
+				timeIndex		: 0,
+				times			: [
+					{ type: 2, text: '固定时间（区间范围）' },
+					{ type: 1, text: '延期券（用户领取后有效天数）' }
+				],
+				showDatePicker	: false,	// 活动弹出层时间
+				datePickerValue	: [],		// 活动时间
+				cover			: '',		// 优惠券图标
+				useWay			: 1,		// 使用途径
+				couponsTitle	: '',		// 优惠券标题
+				quantity		: 1,		// 发券数量
+				personQuantity	: 1,		// 每人限领
+				full			: '',		// 满足金额
+				price			: '',		// 减少金额
+				description		: '',		// 使用规则
+				coupongoods		: [],		// 关联商品
+				timeNumber		: 1			// 延期券时间
+			};
+		},
+		onShow(){
+			this.coupongoods = this.$store.getters.getCoupongoods
+		},
+		methods:{
+			// 发券数量
+			quantityChange(value){
+				this.quantity = value
+			},
+			// 每人限领
+			personQuantityChange(value){
+				this.personQuantity = value
+			},
+			// 延期券时间
+			timeNumberChange(value){
+				this.timeNumber = value
+			},
+			// 使用渠道
+			radioChange(e){
+				this.useWay = e.detail.value
+			},
+			// 选择
+			changePicker(e){
+				this[e.target.dataset.type] = e.detail.value
+			},
+			// 日期
+			confirmDatePicker(e){
+				this.datePickerValue = e.value
+				this.showDatePicker	 = false
+			},
+			// 上传优惠券封面
+			updCover(){
+				uni.chooseImage({
+					crop: {width: 300, height: 300},
+					success: path=> {
+						uploads([{
+							uri : path.tempFilePaths[0]
+						}]).then(res => {
+							this.cover = res.url[0]
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon : 'none'
+							})
+						})
+					}
+				})
+			},
+			// 选择关联商品
+			onSelectGoods(){
+				this.$Router.push({name: 'selectGoods', params: {type: this.types[this.typeIndex].id}})
+			},
+			// 发布优惠券
+			updComponent(){
+				let valuss = {
+					title			: this.couponsTitle,
+					cover			: this.cover,
+					type			: this.types[this.typeIndex].id,
+					full			: this.full || 0,
+					price			: this.price || 0,
+					quantity		: this.quantity,
+					use_way			: this.useWay,
+					person_quantity	: this.personQuantity,
+					start_at		: this.datePickerValue[0],
+					end_at			: this.datePickerValue[1],
+					description		: this.description,
+					time_type		: this.times[this.typeIndex].type,
+					days			: this.timeNumber,
+					goodsable_ids	: this.coupongoods
+				}
+				
+				pushCoupons(valuss).then(res => {
+					uni.showModal({
+						title		: '提示',
+						content		: res,
+						showCancel	: false,
+						confirmText	: '确定',
+						confirmColor: '#e93340',
+						success		: modalRes => {
+							this.$store.commit('setCoupongoods', [])
+							this.$Router.back()
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.add-btn{
+		padding: $padding;
+		button{
+			height: 90rpx;
+			line-height: 90rpx;
+			background: $text-price;
+			color: white;
+			font-size: $title-size;
+			font-weight: bold;
+			border-radius: 0;
+			&::after{
+				border: none;
+			}
+		}
+	}
+	// 优惠券详情
+	.add-textarea{
+		background: white;
+		margin-top: $margin;
+		padding: $padding $padding $padding ($padding + 180rpx);
+		label{
+			position: absolute;
+			left: $padding;
+			line-height: 40rpx;
+			height: 40rpx;
+		}
+		textarea{
+			width: 100%;
+			padding: 0;
+			margin: 0;
+			line-height: 40rpx;
+			height: 200rpx;
+		}
+	}
+	// 优惠券配置
+	.add-info{
+		background-color: white;
+		padding: 0 $padding;
+		.inputs{
+			position: relative;
+			padding-left: 180rpx;
+			&::after{
+				position: absolute;
+				height: 1rpx;
+				content: " ";
+				background: $border-color;
+				left: 0;
+				right: -$padding;
+				bottom: 0;
+			}
+			&:last-child::after{
+				display: none;
+			}
+			.input-label{
+				position: absolute;
+				left: 0;
+				line-height: 90rpx;
+				height: 90rpx;
+			}
+			.input-text,
+			input{
+				height: 90rpx;
+				line-height: 90rpx;
+				font-size: $title-size-lg;
+			}
+			.input-text{
+				position: relative;
+				padding-right: 90rpx;
+				.picker-icon{
+					position: absolute;
+					right: 0;
+				}
+			}
+			.input-number{
+				display: flex;
+				align-items: center;
+				height: 90rpx;
+			}
+			.input-checkbox{
+				min-height: 90rpx;
+				display: flex;
+				.input-checkbox-item{
+					line-height: 90rpx;
+					margin-right: $margin;
+					radio{
+						transform:scale(0.8);
+						margin-right: -15rpx;
+					}
+					text{
+						padding: 0 ($padding/2);
+						line-height: 50rpx;
+						display: inline-block;
+						font-size: $title-size-lg;
+					}
+				}
+			}
+			.inputs{}
+		}
+	}
+	// 发布预览
+	.coupons-preview{
+		background: white;
+		margin: $margin;
+		border-radius: $radius/2;
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		padding: $padding 0;
+		.item{
+			position: relative;
+			padding: 0 $padding;
+		}
+		.cover{
+			position: relative;
+			border-right: dashed 3rpx $border-color;
+			width: 148rpx;
+			text-align: center;
+			.cover-img{
+				width: 148rpx;
+				height: 148rpx;
+				border-radius: $radius/2;
+				vertical-align: top;
+				background: $border-color-lg;
+				border:solid 1rpx $border-color;
+				box-sizing: border-box;
+			}
+			.cover-price{
+				padding-top: 24rpx;
+				font-weight: bold;
+				line-height: 58rpx;
+				font-size: $title-size + 10;
+				color: $text-price;
+				text{
+					font-size: 70%;
+					padding-left: 5rpx;
+				}
+			}
+			.cover-subtitle{
+				padding-bottom: 24rpx;
+				line-height: 40rpx;
+				color: $text-gray;
+				font-size: $title-size-sm;
+			}
+			&::after,&::before{
+				position: absolute;
+				width: 30rpx;
+				height: 30rpx;
+				background: #f8f8f8;
+				content: " ";
+				right: -16rpx;
+				border-radius: 50%;
+			}
+			&::after{
+				top: -($padding + 15);
+			}
+			&::before{
+				bottom: -($padding + 15);
+			}
+		}
+		.mian{
+			justify-content: center;
+			width: calc(100% - 148rpx - #{$padding*2});
+			box-sizing: border-box;
+			@extend .vertical;
+			.title{
+				font-size: $title-size-lg;
+				line-height: 50rpx;
+			}
+			.time, .goods{
+				color: $text-gray-m;
+				font-size: $title-size-m;
+				line-height: 40rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/coupons/magDetails.vue b/pages/coupons/magDetails.vue
new file mode 100644
index 0000000..cba3559
--- /dev/null
+++ b/pages/coupons/magDetails.vue
@@ -0,0 +1,269 @@
+<template>
+	<view class="content" v-if="!isLoding">
+		<view class="details">
+			<view class="header">
+				<view class="info-item">
+					<view class="info-item-title">优惠券标题</view>
+					<view class="info-item-text">{{details.title}}</view>
+				</view>
+				<view class="info-item">
+					<view class="info-item-title">优惠券类型</view>
+					<view class="info-item-text">{{details.type.text}}</view>
+				</view>
+				<view class="info-item">
+					<view class="info-item-title">上架状态</view>
+					<view class="info-item-text">已{{details.status.text}}</view>
+				</view>
+				<view class="info-item">
+					<view class="info-item-title">使用渠道</view>
+					<view class="info-item-text">{{details.use_way}}</view>
+				</view>
+				<view class="info-item" v-if="details.type.value === 2">
+					<view class="info-item-title">满减</view>
+					<view class="info-item-text">满{{details.price}}减{{details.full}}</view>
+				</view>
+				<view class="info-item">
+					<view class="info-item-title">券发放量</view>
+					<view class="info-item-text">{{details.quantity}}</view>
+				</view>
+				<view class="info-item">
+					<view class="info-item-title">已发放量</view>
+					<view class="info-item-text">{{details.grant_quantity}}</view>
+				</view>
+				<view class="info-item">
+					<view class="info-item-title">每人限领</view>
+					<view class="info-item-text">{{details.person_quantity == 0 ? '不限制': details.person_quantity}}</view>
+				</view>
+				<block v-if="details.time_type.value === 1">
+					<view class="info-item">
+						<view class="info-item-title">券有效期(起)</view>
+						<view class="info-item-text">{{details.start_at}}</view>
+					</view>
+					<view class="info-item">
+						<view class="info-item-title">券有效期(止)</view>
+						<view class="info-item-text">{{details.end_at}}</view>
+					</view>
+				</block>
+				<block v-if="details.time_type.value === 2">
+					<view class="info-item">
+						<view class="info-item-title">券有效期</view>
+						<view class="info-item-text">领取后{{details.days}}天内有效</view>
+					</view>
+				</block>
+				<view class="info-item">
+					<view class="info-item-title">创建时间</view>
+					<view class="info-item-text">{{details.created_at}}</view>
+				</view>
+			</view>
+			<view class="mian">
+				<block v-if="details.goods.length > 0">
+					<view class="mian-title">关联商品</view>
+					<view class="mian-goods">
+						<view class="item" v-for="(item, index) in details.goods" :key="index">
+							<view class="item-title nowrap">{{item.name}}</view>
+							<view class="item-price nowrap">￥{{item.price}}</view>
+						</view>
+					</view>
+				</block>
+				<view class="mian-title">使用说明</view>
+				<view class="mian-text">
+					<text>{{details.description || '-'}}</text>
+				</view>
+			</view>
+		</view>
+		<view class="ios-bottom"></view>
+		<!-- footer -->
+		<view class="footer">
+			<view class="footer-flex">
+				<view class="item" @click="putStatus">{{details.status.value == 4 ? '上架': '下架'}}</view>
+				<view class="item" @click="onCouponsRecommend">{{recommended ? '设为推荐': '已设为推荐'}}</view>
+			</view>
+			<view class="ios-bottom"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { magCouponsInfo, magCouponsStatus, magCouponsRecommend } from '@/apis/interfaces/coupons'
+	export default {
+		data() {
+			return {
+				isLoding	: true,
+				recommended	: false,
+				details		: {}
+			};
+		},
+		onShow() {
+			magCouponsInfo(this.$Route.query.couponId).then(res => {
+				this.recommended = res.can.recommended
+				this.details  	 = res
+				this.isLoding 	 = false
+			})
+		},
+		methods:{
+			// 上下架
+			putStatus(){
+				magCouponsStatus(this.details.coupon_id).then(res => {
+					uni.showToast({
+						title: res,
+						icon : 'none'
+					})
+					this.$set(this.details, 'status', this.details.status.value == 4 ? {'value': 2,'text': "上架"} : {'value': 4,'text': "下架"})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			// 设为推荐
+			onCouponsRecommend(){
+				magCouponsRecommend(this.details.coupon_id).then(res => {
+					this.recommended = !this.recommended
+					uni.showToast({
+						title: res.message,
+						icon : 'none'
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	// content
+	.content{
+		padding-bottom: $padding + 90;
+	}
+	// footer
+	.footer{
+		box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
+		background: white;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: ($padding/2) $padding;
+		.footer-flex{
+			display: flex;
+			justify-content: space-between;
+			.item{
+				line-height: 70rpx;
+				width: 50%;
+				text-align: center;
+				color: $text-price;
+				font-size: $title-size-lg;
+				font-weight: bold;
+				border-right: solid 1rpx $border-color;
+				&:last-child{
+					border: none;
+				}
+			}
+		}
+	}
+	.details{
+		margin: $margin;
+		background: white;
+		border-radius: $radius;
+		// 优惠券信息
+		.header{
+			position: relative;
+			border-bottom: dashed 2rpx $border-color;
+			padding: $padding;
+			&::after,&::before{
+				position: absolute;
+				width: 30rpx;
+				height: 30rpx;
+				background: #f8f8f8;
+				content: " ";
+				bottom: -16rpx;
+				border-radius: 50%;
+			}
+			&::after{
+				left: -16rpx;
+			}
+			&::before{
+				right: -16rpx;
+			}
+			.info{
+				padding: $padding 0;
+				text-align: center;
+				.info-cover{
+					width: 128rpx;
+					height: 128rpx;
+					border-radius: 50%;
+					vertical-align: top;
+				}
+				.info-title{
+					padding-top: $padding;
+					text-align: center;
+					font-weight: bold;
+					font-size: $title-size;
+				}
+			}
+			.info-item{
+				position: relative;
+				padding-left: 200rpx;
+				min-height: 60rpx;
+				font-size: $title-size-lg;
+				padding-bottom: $padding/3;
+				&:last-child{
+					padding-bottom: 0;
+				}
+				.info-item-title{
+					position: absolute;
+					left: 0;
+					top: 0;
+					line-height: 50rpx;
+					color: $text-color;
+				}
+				.info-item-text{
+					line-height: 50rpx;
+					color: $text-gray;
+					text-align: right;
+					@extend .nowrap;
+				}
+			}
+		}
+		// 优惠券介绍
+		.mian{
+			padding: $padding;
+			.mian-title{
+				font-size: $title-size-lg;
+				font-weight: bold;
+				line-height: 50rpx;
+				color: $text-color;
+			}
+			.mian-text{
+				font-size: $title-size-m;
+				color: $text-gray;
+				padding-top: $padding/3;
+			}
+			.mian-goods{
+				padding-bottom: $padding;
+				.item{
+					display: flex;
+					justify-content: space-between;
+					line-height: 60rpx;
+					font-size: $title-size-m;
+					padding-top: $padding/3;
+					.item-title{
+						width: 75%;
+						color: $text-gray;
+					}
+					.item-price{
+						width: 25%;
+						color: $text-price;
+						font-weight: bold;
+						text-align: right;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/coupons/management.vue b/pages/coupons/management.vue
new file mode 100644
index 0000000..e31b8e1
--- /dev/null
+++ b/pages/coupons/management.vue
@@ -0,0 +1,265 @@
+<template>
+	<view>
+		<view class="header">
+			<view class="tabs">
+				<view class="item" :class="{'show': listType == ''}" @click="onTabs('')">全部</view>
+				<view class="item" :class="{'show': listType == '1'}" @click="onTabs('1')">服务券</view>
+				<view class="item" :class="{'show': listType == '2'}" @click="onTabs('2')">代金券</view>
+				<view class="item" :class="{'show': listType == '3'}" @click="onTabs('3')">提货券</view>
+			</view>
+			<view class="tabs-type">
+				<view class="item" :class="{'show': tabsType == ''}" @click="onTabsType('')">全部</view>
+				<view class="item" :class="{'show': tabsType == 'shown'}" @click="onTabsType('shown')">已上架</view>
+				<view class="item" :class="{'show': tabsType == 'unshown'}" @click="onTabsType('unshown')">已下架</view>
+				<view class="item" :class="{'show': tabsType == 'expire'}" @click="onTabsType('expire')">即将过期</view>
+				<view class="item" :class="{'show': tabsType == 'over'}" @click="onTabsType('over')">已过期</view>
+			</view>
+		</view>
+		<block v-if="coupons.length > 0">
+			<view class="coupons">
+				<view class="coupons-flex" v-for="(item, index) in coupons" :key="index" @click="$Router.push({name: 'magDetails', params: {couponId: item.coupon_id}})">
+					<view class="item cover">
+						<view v-if="item.type.value === 2">
+							<view class="cover-price">{{item.price || 0}}<text>元</text></view>
+							<view class="cover-subtitle">代金券</view>
+						</view>
+						<image v-else class="cover-img" :src="item.cover" mode="aspectFill" />
+					</view>
+					
+					<view class="item mian">
+						<view class="title nowrap">{{item.title}}</view>
+						<view class="time nowrap">
+							<block v-if="item.time_type.value == 1">{{item.start_at}}至{{item.end_at}}</block>
+							<block v-if="item.time_type.value == 2">领取后{{item.days}}天内有效</block>
+						</view>
+						<view class="tags nowrap">
+							<text>已{{item.status.text}}</text>
+							<text>{{item.goods_count}}商品可用</text>
+						</view>
+					</view>
+					<view class="arrowright">
+						<uni-icons type="arrowright" size="16" color="#999"></uni-icons>
+					</view>
+				</view>
+			</view>
+		</block>
+		<block v-else>
+			<view class="list-null">
+				<view class="sub-title">暂无相关优惠券</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import { toolsCoupons } from '@/apis/interfaces/coupons'
+	export default {
+		data() {
+			return {
+				listType: '',
+				tabsType: '',
+				coupons	: [],
+				pages	: {}
+			};
+		},
+		onShow() {
+			this.getCoupons()
+		},
+		methods:{
+			// 选择类型
+			onTabs(value){
+				if(value == this.listType) return
+				this.listType = value
+				this.getCoupons()
+			},
+			// 状态筛选
+			onTabsType(val){
+				if(this.tabsType === val) return
+				this.tabsType = val
+				this.getCoupons()
+			},
+			// 数据列表
+			getCoupons(){
+				toolsCoupons({
+					type	: this.listType,
+					status	: this.tabsType
+				}).then(res => {
+					console.log(res)
+					this.coupons = res.lists.data
+					this.pages = res.lists.page
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+		},
+		onNavigationBarButtonTap() {
+			this.$Router.push({name: 'couponsAdd'})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	// tabs
+	.header{
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 99;
+		.tabs{
+			display: flex;
+			justify-content: space-around;
+			background: white;
+			padding: 15rpx 0;
+			font-size: $title-size-lg;
+			color: $text-gray;
+			.item{
+				height: 60rpx;
+				line-height: 60rpx;
+				&.show{
+					color: $text-price;
+					border-bottom: solid 4rpx $text-price;
+				}
+			}
+		}
+		// 类型
+		.tabs-type{
+			display: flex;
+			padding: 20rpx 30rpx;
+			background: white;
+			.item{
+				font-size: $title-size-sm;
+				height: 46rpx;
+				line-height: 46rpx;
+				border-radius: 23rpx;
+				padding: 0 ($padding - 10);
+				background: white;
+				margin-right: $margin/2;
+				color: $text-gray;
+				&.show{
+					background-color: rgba($color: $text-price, $alpha: .1);
+					color: $text-price;
+				}
+			}
+		}
+	}
+	// 空提示
+	.list-null{
+		width: 100vw;
+		height: 100vh;
+		box-sizing: border-box;
+		text-align: center;
+		@extend .vertical;
+		.sub-title{
+			color: $text-gray;
+			font-size: $title-size-m;
+		}
+		.icon{
+			width: 288rpx;
+		}
+	}
+	// 订单管理
+	.coupons{
+		padding-top: 180rpx;
+		@extend .ios-bottom;
+		.coupons-flex{
+			position: relative;
+			background: white;
+			margin: $margin;
+			border-radius: $radius/2;
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			padding: $padding 70rpx $padding 0;
+			.item{
+				position: relative;
+				padding: 0 $padding;
+			}
+			.arrowright{
+				position: absolute;
+				right: $margin;
+				top: 0;
+				bottom: 0;
+				@extend .vertical
+			}
+			.cover{
+				position: relative;
+				border-right: dashed 3rpx $border-color;
+				width: 148rpx;
+				text-align: center;
+				.cover-img{
+					width: 148rpx;
+					height: 148rpx;
+					border-radius: $radius/2;
+					vertical-align: top;
+					background: $border-color-lg;
+					border:solid 1rpx $border-color;
+					box-sizing: border-box;
+				}
+				.cover-price{
+					padding-top: 24rpx;
+					font-weight: bold;
+					line-height: 58rpx;
+					font-size: $title-size + 10;
+					color: $text-price;
+					text{
+						font-size: 70%;
+						padding-left: 5rpx;
+					}
+				}
+				.cover-subtitle{
+					padding-bottom: 24rpx;
+					line-height: 40rpx;
+					color: $text-gray;
+					font-size: $title-size-sm;
+				}
+				&::after,&::before{
+					position: absolute;
+					width: 30rpx;
+					height: 30rpx;
+					background: #f8f8f8;
+					content: " ";
+					right: -16rpx;
+					border-radius: 50%;
+				}
+				&::after{
+					top: -($padding + 15);
+				}
+				&::before{
+					bottom: -($padding + 15);
+				}
+			}
+			.mian{
+				justify-content: center;
+				width: calc(100% - 148rpx - #{$padding*2});
+				box-sizing: border-box;
+				@extend .vertical;
+				.title{
+					font-size: $title-size-lg;
+					line-height: 50rpx;
+					font-weight: bold;
+				}
+				.time, .tags{
+					color: $text-gray-m;
+					font-size: $title-size-m;
+					line-height: 40rpx;
+				}
+				.tags{
+					margin-top: 10rpx;
+					text{
+						background: $border-color-lg;
+						color: $text-gray;
+						padding: 0 ($padding/2);
+						margin-right: ($margin/2);
+						&:last-child{
+							margin-right: 0;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/coupons/selectGoods.vue b/pages/coupons/selectGoods.vue
new file mode 100644
index 0000000..e2614d9
--- /dev/null
+++ b/pages/coupons/selectGoods.vue
@@ -0,0 +1,243 @@
+<template>
+	<view>
+		<!-- 商品列表 -->
+		<view class="lists">
+			<view class="goods-item" v-for="(item, index) in goods" :key="index">
+				<checkbox class="checkbox" :checked="item.isSelect" @click="onSelect(index)"/>
+				<view class="mian">
+					<image class="cover" :src="item.cover" mode="aspectFill" />
+					<view class="title">{{item.title}}</view>
+					<view class="subtitle">{{item.description}}</view>
+					<view class="mian-flex">
+						<view class="price"><text>￥</text>{{item.price}}</view>
+						<view class="inventory">权证剩余{{item.stock}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="ios-bottom"></view>
+		</view>
+		<!-- footer -->
+		<view class="footer">
+			<view class="footer-flex">
+				<view class="flex-checkbox">
+					<checkbox class="checkbox" :checked="allSelect" @click="onAllSelect"/>
+					<label for="all">
+						<view class="text">全选</view>
+						<view class="sub-text">已选{{selectGoods.length}}件</view>
+					</label>
+				</view>
+				<view class="flex-button" @click="setGoods">确定</view>
+			</view>
+			<view class="ios-bottom"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { couponsGoods, couponsAddgoods } from '@/apis/interfaces/coupons'
+	export default {
+		data() {
+			return {
+				goods		: [],
+				selectGoods	: [],
+				allSelect	: false
+			};
+		},
+		created() {
+			couponsGoods({
+				type: this.$Route.query.type
+			}).then(res => {
+				let coupongoodsIds = this.$store.getters.getCoupongoods,
+					goodsArr	   = res
+				for(let id of coupongoodsIds){
+					let selectIndex = goodsArr.findIndex(val => val.goods_sku_id === id)
+					goodsArr[selectIndex].isSelect = true
+				}
+				this.goods = goodsArr
+				this.selectNumber()
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		methods:{
+			// 全选产品
+			onAllSelect(){
+				for(let val of this.goods){
+					val.isSelect = !this.allSelect
+				}
+				this.selectNumber()
+			},
+			// 选择产品
+			onSelect(index){
+				const goodsItem = this.goods[index]
+				goodsItem.isSelect = !goodsItem.isSelect
+				this.$set(this.goods, index, goodsItem)
+				this.selectNumber()
+			},
+			// 计算产品数量
+			selectNumber(){
+				let selectArr = [];
+				for(let val of this.goods){
+					if(val.isSelect) selectArr.push(val.goods_sku_id)
+				}
+				this.selectGoods = selectArr
+				if(selectArr.length == this.goods.length && this.goods.length != 0) this.allSelect = true
+				else this.allSelect = false
+			},
+			// 添加设置产品
+			setGoods(){
+				if(this.selectGoods.length <= 0){
+					uni.showToast({
+						title: '请选择优惠券关联商品',
+						icon : 'none'
+					})
+					return
+				}
+				this.$store.commit('setCoupongoods', this.selectGoods)
+				this.$Router.back()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	// 列表
+	.lists{
+		padding-bottom: ($padding + 10) + 70;
+		.goods-item{
+			background: white;
+			padding: $padding $padding $padding ($padding + 70);
+			position: relative;
+			border-bottom: solid 1rpx $border-color;
+			.checkbox{
+				left: $padding;
+			}
+			.mian{
+				position: relative;
+				padding-left: $padding + 168;
+				min-height: 168rpx;
+				.cover{
+					position: absolute;
+					left: 0;
+					top: 0;
+					width: 168rpx;
+					height: 168rpx;
+				}
+				.title{
+					font-size: $title-size-lg;
+					line-height: 40rpx;
+					height: 48rpx;
+					@extend .nowrap;
+				}
+				.subtitle{
+					color: $text-gray;
+					font-size: $title-size-m;
+					height: 80rpx;
+					line-height: 40rpx;
+					margin-bottom: 8rpx;
+					@extend .nowrap;
+				}
+				.mian-flex{
+					display: flex;
+					justify-content: space-between;
+					.price{
+						width: 50%;
+						font-weight: bold;
+						color: $text-price;
+						font-size: $title-size;
+						height: 40rpx;
+						line-height: 40rpx;
+						@extend .nowrap;
+					}
+					.inventory{
+						width: 50%;
+						text-align: right;
+						font-size: $title-size-sm;
+						color: $text-gray;
+						height: 40rpx;
+						line-height: 40rpx;
+						@extend .nowrap;
+					}
+				}
+			}
+		}
+	}
+	// footer
+	.footer{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background: white;
+		padding: ($padding - 10) $padding;
+		z-index: 99;
+		box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
+		.footer-flex{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			.flex-checkbox{
+				position: relative;
+				width: 50%;
+				padding-right: $padding;
+				padding-left: 70rpx;
+				box-sizing: border-box;
+				.text{
+					font-size: $title-size-lg;
+					font-weight: bold;
+					line-height: 40rpx;
+					color: $text-color;
+				}
+				.sub-text{
+					font-size: $title-size-sm;
+					color: $text-gray;
+					line-height: 40rpx;
+					@extend .nowrap;
+				}
+			}
+			.flex-button{
+				background: $text-price;
+				color: white;
+				width: 50%;
+				text-align: center;
+				line-height: 80rpx;
+				border-radius: $radius/2;
+				font-size: $title-size;
+				font-weight: bold;
+			}
+		}
+	}
+	// checkbox
+	.checkbox{
+		position: absolute;
+		left: 0;
+		top: 50%;
+		margin-top: -28rpx;
+		.uni-checkbox-input{
+			border: 1px solid $border-color;
+			border-radius: 50%;
+			width: 46rpx;
+			height: 46rpx;
+			box-sizing:border-box;
+		}
+		.uni-checkbox-input.uni-checkbox-input-checked{
+			border: none;
+			background: $text-price;
+		}
+		.uni-checkbox-input.uni-checkbox-input-checked::before{
+			border-radius: 50%;
+			width: 40rpx;
+			height: 40rpx;
+			line-height: 40rpx;
+			text-align: center;
+			font-size: 24rpx;
+			color:#fff;
+			background: transparent;
+			transform:translate(-50%, -50%) scale(1);
+			-webkit-transform:translate(-50%, -50%) scale(1);
+		}
+	}
+</style>
diff --git a/pages/found/index.vue b/pages/found/index.vue
index cfd8f45..706aafc 100644
--- a/pages/found/index.vue
+++ b/pages/found/index.vue
@@ -1,19 +1,549 @@
 <template>
-	<view>
-		发现更多
+	<view class="crystal">
+        <!-- 公共提示弹出 start -->
+        <order-tips title="温馨提示" content="恭喜您,签到成功" :tipsState="sign.signShow" @tipseject="signject" />
+        <!-- 公共提示弹出 end -->
+        
+        <!-- 公共提示弹出 start -->
+        <order-tips :title="tips.tipsTitle" :content="tips.tipsContent" :tipsState="tips.tipsState" @tipseject="tipseject" />
+        <!-- 公共提示弹出 end -->
+        
+		<!-- 账户余额 -->
+		<view class="total">
+			<view class="item ellipsis"><image src="@/static/icons/gemstone-icon.png"/>原石 {{ account.coin }}</view>
+			<view class="item ellipsis"><image src="@/static/icons/crystal-icon.png"/>水晶 {{ account.crystal }}</view>
+		</view>
+		<!-- 矿石 -->
+		<view class="ore">
+			<image src="/static/img/crystal-ore.png" mode="widthFix" />
+			<view class="ore-lists">
+				<view class="oct-float ore-item" v-for="(item, index) in crystalArr" :key="index" @click="ledCrystal(index)">
+					<block v-if="item.amount !== null">
+						<image src="/static/imgs/crystal-ore-icon.png" mode="widthFix" class="icon" />
+						<view class="text">水晶{{ item.amount || '-'}}</view>
+					</block>
+				</view>
+				<navigator url="../index/index" open-type="switchTab" hover-class="none" class="oct-float ore-item-nav">
+					<image src="/static/imgs/gemstone-ore-icon.png" mode="widthFix" class="icon" />
+					<view class="text">购物<uni-icons type="arrowright" color="#FFFFFF" size="14"></uni-icons></view>
+				</navigator>
+			</view>
+		</view>
+		<!-- 任务分类 -->
+		<scroll-view class="task-block" scroll-x="true">
+             <!-- url="../index/index" open-type="switchTab" -->
+             <view class="item" v-for="(item, index) in categoryArr" :key="index" @click="JumpUrl(item.url, item.title)">
+             	<view class="text">{{ item.remark }}</view>
+             	<view class="icon">
+             		<image :src="item.cover" />
+             	</view>
+             	<view class="title">{{ item.title }}</view>
+             </view>
+		</scroll-view>
+		<!-- 内容 -->
+		<view class="content">
+			<!-- 签到 -->
+			<view class="signCont">
+			    <view class="content-title">
+                    <view class="content-title-text">
+                        每日签到
+                        <view class="tips">
+                            累计天数越多。水晶奖励越多
+                        </view>
+                    </view>
+                    <view class="content-titl-btn" v-if="sign.signCan" @click="signClick">
+                        立即签到
+                    </view>
+                </view>
+			    <view class="sign">
+			    	<view class="sign-list">
+			    		<view class="item" v-for="(item, index) in sign.signArr" :key="index">
+                            <view class="item-icon item-done" v-if="item.sign">
+                                <image src="@/static/imgs/crystal-sign.png" mode="aspectFill"></image>
+                            </view>
+                            <view class="item-icon show" :class="{ active: index == 3 || index == 7 }" v-else><text>+{{ item.crystal }}</text></view>
+			    			<view class="item-title">{{ item.text }}</view>
+			    		</view>
+			    	</view>
+			    	<view class="sign-text">再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个水晶奖励</view>
+			    </view>
+			</view>
+			<!-- 水晶任务 -->
+            <view class="content-title">
+                <view class="content-title-text">
+                    水晶任务
+                </view>
+            </view>
+			<view class="task">
+				<view class="task-item" v-for="(item, index) in task" :key="index" @click="JumpUrl(item.url, item.title)">
+					<image class="task-icon" :src="item.ico" mode="aspectFill"></image>
+					<view class="task-title">{{item.title || '-'}}</view>
+					<view class="task-subtitle">{{item.remark || '-'}}</view>
+					<view class="task-label">{{item.tips || '-'}}<image class="task-label-icon" src="@/static/imgs/user-crystalMark-grey.png" @click.stop="crystalShow"></image></view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
-
 <script>
+	import { crystals, thawlog, task, category, sign, operateSign } from '@/apis/interfaces/crystal'
 	export default {
 		data() {
 			return {
-				
-			};
+				account: {
+					coin: 0,
+					crystal: '0.00'
+				},
+				yesterday: '0.00',
+				crystalArr: [],
+                categoryArr: [],  // 分类列表
+				ids: [],
+				task: [],
+                sign: {
+                    signArr : [],
+                    nextTask: '',
+                    signCan : false,
+                    signShow: false
+                },
+                tips        : {
+                    tipsTitle   : '',   // 弹出的动态名称
+                    tipsContent : '',   // 弹出的动态内容
+                    tipsState   : false // 弹出的动态状态
+                }
+			}
+		},
+		onShow() {
+			// 获取水晶领取信息
+			crystals().then(res => {
+				this.account = {
+					coin: res.coin,
+					crystal: res.crystal
+				}
+				this.crystalArr = res.crystal_array
+				this.ids = res.all_ids
+				this.yesterday = res.yesterday_crystal
+			}).catch(err => {
+				uni.showToast({
+					icon: 'none',
+					title: err.message
+				})
+			})
+			// 获取水晶任务
+			task().then(res => {
+				this.task = res
+			})
+            
+            // 获取水晶分类
+            category().then(res => {
+                this.categoryArr = res
+            })
+            
+            // 获取水晶签到信息
+            this.signInfo();
+            
+		},
+		methods: {
+			ledCrystal(index) {
+				// 领取水晶
+				thawlog({
+					thaw_id: this.crystalArr[index].log_id,
+					all_ids: this.ids
+				}).then(res => {
+					uni.showToast({
+						icon: 'none',
+						title: '+' + this.crystalArr[index].amount + '水晶',
+						duration: 2000
+					})
+					this.$set(this.account, 'crystal', res.crystal)
+					this.ids = res.all_ids
+					if (JSON.stringify(res.last) === '[]') {
+						this.$set(this.crystalArr, index, {
+							amount: null
+						})
+						return
+					}
+					this.$set(this.crystalArr, index, res.last)
+				}).catch(err => {
+					uni.showToast({
+						icon: 'none',
+						title: err
+					})
+				})
+			},
+			// 商品详情
+			onTack(e) {
+				uni.navigateTo({
+					url: '../goods/goods?id=' + e.goods_id
+				})
+			},
+			// 提示信息
+			onShowToast() {
+				uni.showToast({
+					title: '暂未开放，敬请期待',
+					icon : 'none'
+				})
+			},
+            // 水晶签到信息
+            signInfo() {
+                sign().then(res => {
+                    this.sign.signArr  = res.lists
+                    this.sign.nextTask = res.next_task
+                    this.sign.signCan  = res.can_sign
+                }).catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err
+                    })
+                })
+            },
+            // 签到
+            signClick() {
+                uni.vibrateShort({
+                    success: () => {
+                        operateSign().then(res => {
+                            // 获取水晶签到信息
+                            this.signInfo();
+                            
+                            this.sign.signShow = !this.sign.signShow
+                        }).catch(err => {
+                        	uni.showToast({
+                        		icon: 'none',
+                        		title: err
+                        	})
+                        })
+                    }
+                })
+            },
+            // 提示语-组件返回参数
+            signject(val) {
+                console.log(val)
+                this.sign.signShow = val.tipsState
+            },
+            
+            // 水晶分类跳转
+            JumpUrl(open, title) {
+                var type = open.openType;
+                 switch(type){
+                    case 'switchTab': 
+                        uni.switchTab({
+                            url: open.path
+                        })
+                        break;
+                    case 'web':
+                        uni.navigateTo({
+                            url: `/pages/web-view/index?title=${title}&url=${open.url}`
+                        })
+                        break;
+                    case 'navigateTo':
+                        uni.navigateTo({
+                            url: open.path
+                        })
+                        break;
+                }
+            },
+            
+            // 水晶原则提示语
+            crystalShow () {
+                this.tips.tipsTitle   = '水晶规则'
+                this.tips.tipsContent = '水晶是用户获取原石的影响因子，同一时段内，水晶越高，获取的原石越多.'
+                this.tips.tipsState = !this.tips.tipsState
+            },
+            // 水晶原则提示语-组件返回参数
+            tipseject(val) {
+                this.tips.tipsState = val.tipsState
+            },
 		}
 	}
 </script>
+<style scoped>
+	/* 水晶漂浮动画 */
+	.oct-float {
+		animation: 4s octfloat infinite;
+	}
+	@keyframes octfloat {
+		0% {
+			margin-top: 0;
+		}
 
-<style lang="scss">
+		50% {
+			margin-top: 15rpx;
+		}
 
+		100% {
+			margin-top: 0;
+		}
+	}
+</style>
+
+<style lang="scss" scoped>
+	// 背景
+	.crystal{
+		background: $mian-color-deep;
+		min-height: 100vh;
+		padding-top: var(--status-bar-height);
+		box-sizing: border-box;
+		background-image: url(@/static/background/crystal-background.png);
+		background-size: 100%;
+		background-position: top center;
+		background-repeat: no-repeat;
+	}
+	// 底部内容
+	.content{
+		margin-top: $margin * 2;
+		padding: $padding;
+		background: white;
+		border-radius: $radius $radius 0 0;
+		// 标题
+		.content-title{
+			padding: 0 $padding / 2;
+            width: 100%;
+            box-sizing: border-box;
+			color: $text-color;
+            position: relative;
+            .content-title-text {
+                font-weight: bold;
+                font-size: $title-size + 4;
+                width: calc(100% - 160rpx);
+                margin-bottom: $margin;
+                .tips {
+                    font-weight: normal;
+                    font-size: $title-size-sm;
+                    margin-top: $margin - 10;
+                    color: $uni-text-color;
+                }
+            }
+            .content-titl-btn {
+                position: absolute;
+                right: 0;
+                top: $margin;
+                background-image: linear-gradient(to left, $mian-color-deep, $mian-color);
+                color: $uni-text-color-inverse;
+                font-size: $title-size-sm;
+                line-height: 60rpx;
+                line-height: 60rpx;
+                border-radius: $radius * 2;
+                width: 160rpx;
+                text-align: center;
+            }
+		}
+		// 签到
+		.sign{
+			padding-top: $padding;
+			padding-bottom: $padding * 2;
+			.sign-list{
+				display: flex;
+				justify-content: space-around;
+				.item{
+					text-align: center;
+					.item-icon{
+						display: inline-block;
+						background-image: linear-gradient(to left, $mian-color-deep, $mian-color);
+						color: white;
+						width: 54rpx;
+						height: 54rpx;
+						line-height: 50rpx;
+						border-radius: 50%;
+						border:solid 2rpx $mian-color;
+						box-sizing: border-box;
+                        &.item-done {
+                            background-image: linear-gradient(to left, #999, #999);
+                            border-color: #999;
+                        }
+                        image {
+                            width: 34rpx;
+                            height: 34rpx;
+                            margin-top: 8rpx;
+                        }
+                        &.active {
+                            background-image: linear-gradient(to left, #ee1d23, #ef8c85);
+                            border-color: #fd6165;
+                        }
+                        text {
+                            font-size: $title-size-sm;
+                            transform: scale(.8);
+                            display: block;
+                        }
+					}
+					.item-title{
+						color: $text-gray;
+						padding-top: $padding / 2;
+						font-size: $title-size-sm - 2;
+					}
+				}
+			}
+			.sign-text{
+				padding: $padding ($padding / 2) 0;
+				color: $mian-color-deep;
+				font-size: $title-size-m;
+			}
+		}
+		// 水晶任务
+		.task{
+			padding: 0 ($padding / 2) $padding * 2;
+			.task-item{
+				position: relative;
+				margin: 0 ($margin / 2);
+				border-bottom: solid 1rpx $border-color;
+				padding: $padding 200rpx $padding 90rpx;
+				&:last-child{
+					border-bottom: none;
+				}
+				.task-icon{
+					position: absolute;
+					top: $padding + 8;
+					left: 0;
+					width: 70rpx;
+					height: 70rpx;
+					// background: $border-color-lg;
+				}
+				.task-title{
+					font-size: $title-size;
+					color: $text-color;
+					line-height: 50rpx;
+				}
+				.task-subtitle{
+					color: $text-gray;
+					font-size: $uni-font-size-sm;
+					line-height: 30rpx;
+				}
+				.task-label{
+					position: absolute;
+					right: 0;
+					top: $padding;
+					line-height: 80rpx;
+					font-size: $uni-font-size-sm;
+					color: $text-color;
+                    display: flex;
+                    .task-label-icon {
+                        width: $uni-img-size-sm - 6;
+                        height: $uni-img-size-sm - 6;
+                        margin: $margin + 4 0 0 $margin - 10;
+                    }
+				}
+			}
+		}
+	}
+	// 数据统计
+	.total {
+		position: relative;
+		margin: $margin ($margin + $margin/2);
+		background: rgba($color: $mian-color-deep, $alpha: .6);
+		padding: 0;
+		display: flex;
+		border-radius: $radius;
+		.item {
+			width: 50%;
+			padding: 0 $padding;
+			text-align: center;
+			color: white;
+			font-size: $title-size-m;
+			line-height: 90rpx;
+			image{
+				width: 38rpx;
+				height: 38rpx;
+				vertical-align: top;
+				margin-top: calc((90rpx - 38rpx) / 2);
+				margin-right: $margin / 2;
+			}
+		}
+	
+		&::before {
+			position: absolute;
+			top: 0;
+			bottom: 0;
+			content: "";
+			width: 2rpx;
+			left: 50%;
+			background: linear-gradient(to bottom, transparent, rgba(255, 255, 255, .7), transparent);
+		}
+	}
+	// 矿石
+	.ore {
+		position: relative;
+		&>image {
+			width: 100%;
+		}
+		.ore-lists {
+			position: absolute;
+			top: 0;
+			left: 0;
+			height: 100%;
+			width: 100%;
+			.oct-float-item{
+				position: absolute;
+				text-align: center;
+				.text {
+					margin-top: $margin / 2;
+					color: white;
+					font-size: $title-size-sm;
+					line-height: 40rpx;
+					text-shadow: 0 3rpx 3rpx rgba($color: #000000, $alpha: .2);
+				}
+				.icon {
+					width: 58rpx;
+					vertical-align: top;
+				}
+			}
+			.ore-item-nav{
+				@extend .oct-float-item;
+				right: $margin * 3;
+				top: 12%;
+			}
+			.ore-item {
+				@extend .oct-float-item;
+				&:nth-child(1) { top: 16%; left: 13%; }
+				&:nth-child(2) { top: 50%; right: 10%; }
+				&:nth-child(3) { top: 23%; right: 20%; }
+				&:nth-child(4) { top: 70%; left: 33%;}
+				&:nth-child(5) { top: 40%; left: 20%; }
+				&:nth-child(6) { top: 58%; left: 10%;}
+				&:nth-child(7) { top: 10%; right: 43%;}
+				&:nth-child(8) { top: 46%; right: 29%;}
+			}
+		}
+	}
+	// 任务
+	.task-block {
+		white-space: nowrap;
+		.item {
+			background: rgba($color: $mian-color, $alpha: .2);
+			display: inline-block;
+			margin-left: $margin;
+			width: 210rpx;
+			padding: $padding * 2 $padding;
+			border-radius: $radius;
+			box-sizing: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .06);
+			text-align: center;
+			&:first-child {
+				margin-left: $margin + $margin/2;
+			}
+			&:last-child {
+				margin-right: $margin + $margin/2;
+			}
+			.icon {
+				display: inline-block;
+				margin: $margin 0;
+				width: 98rpx;
+				height: 98rpx;
+				line-height: 98rpx;
+				background: $mian-color-deep;
+				border-radius: 50%;
+				text-align: center;
+				image {
+					width: 56rpx;
+					height: 56rpx;
+					vertical-align: middle;
+				}
+			}
+			.text {
+				font-size: $title-size-m;
+				color: $mian-color;
+			}
+			.title {
+				font-size: $title-size;
+				color: white;
+				font-weight: bold;
+			}
+		}
+	}
 </style>
diff --git a/pages/found/task.vue b/pages/found/task.vue
new file mode 100644
index 0000000..b674d50
--- /dev/null
+++ b/pages/found/task.vue
@@ -0,0 +1,37 @@
+<template>
+    <view>
+        <task-list :taskArr= 'taskArr' />
+    </view>
+</template>
+
+<script>
+    import { task } from '@/apis/interfaces/crystal'
+    export default {
+    	data() {
+    		return {
+    			taskArr: []
+    		}
+    	},
+        onShow() {
+            // 获取列表
+          this.taskInfo();  
+        },
+        methods: {
+            // 列表
+            taskInfo() {
+            	// 领取水晶
+            	thawlog().then(res => {
+            		console.log(res)
+            	}).catch(err => {
+            		uni.showToast({
+            			icon: 'none',
+            			title: err
+            		})
+            	})
+            },
+        }
+    }
+</script>
+
+<style>
+</style>
diff --git a/pages/goods/add.vue b/pages/goods/add.vue
new file mode 100644
index 0000000..02c9fb6
--- /dev/null
+++ b/pages/goods/add.vue
@@ -0,0 +1,627 @@
+<template>
+	<view class="content">
+		<!-- 商品图片 -->
+		<view class="form-block">
+			<view class="form-upd">
+				<view class="form-title">商品轮播图<text>（首图封面图，点击预览，长按删除）</text></view>
+				<view class="form-imgs">
+					<view
+						class="item"
+						v-for="(item, index) in pictures"
+						:key="index"
+						@click="openImg(index, 'pictures')"
+						@longpress="removeImg(index, 'pictures')"
+					>
+						<image class="item-cover" :src="item.showpath" mode="aspectFill"></image>
+					</view>
+					<view class="item item-add" @click="updCover('pictures')">
+						<image class="item-cover" src="@/static/icons/add-icon.png" mode="aspectFill"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品基本信息 -->
+		<view class="form-block">
+			<view class="form-box inputs-flex">
+				<label class="form-label">商品标题</label>
+				<input type="text" v-model="name" placeholder="输入商品标题"/>
+			</view>
+			<view class="form-box inputs-flex">
+				<label class="form-label">商品描述</label>
+				<input type="text" v-model="description" placeholder="输入商品描述"/>
+			</view>
+			<view class="form-box inputs-flex">
+				<label class="form-label">规格单位</label>
+				<input type="text" v-model="skus_unit" placeholder="输入规格单位 如:件"/>
+			</view>
+			<view class="form-upd">
+				<view class="form-title">商品详情（点击预览，长按删除）</view>
+				<view class="form-imgs">
+					<view
+						class="item"
+						v-for="(item, index) in content"
+						:key="index"
+						@click="openImg(index, 'content')"
+						@longpress="removeImg(index, 'content')"
+					>
+						<image class="item-cover" :src="item.showpath" mode="aspectFill"></image>
+					</view>
+					<view class="item item-add" @click="updCover('content')">
+						<image class="item-cover" src="@/static/icons/add-icon.png" mode="aspectFill"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品价格 -->
+		<view class="form-block">
+			<view class="form-box inputs-flex input-unit">
+				<label class="form-label">市场价格</label>
+				<input type="digit" v-model="skus_cost" placeholder="0.00"/>
+				<text class="units">元{{skus_unit != '' ? '/' + skus_unit : ''}}</text>
+			</view>
+			<view class="form-box inputs-flex input-unit">
+				<label class="form-label">销售价格</label>
+				<input type="digit" v-model="skus_price" placeholder="0.00"/>
+				<text class="units">元{{skus_unit != '' ? '/' + skus_unit : ''}}</text>
+			</view>
+			<view class="form-box inputs-flex input-unit">
+				<label class="form-label">分销佣金</label>
+				<input type="digit" v-model="skus_charge" placeholder="0.00"/>
+				<text class="units">元{{skus_unit != '' ? '/' + skus_unit : ''}}</text>
+			</view>
+		</view>
+		<!-- 商品详情介绍 -->
+		<view class="form-block">
+			<view class="form-box picker-flex">
+				<label class="form-label">支持易货</label>
+				<view class="picker-switch">
+					<switch :checked="isChange" color="#e93340" @change="pickerChange($event, 'isChange')"/>
+				</view>
+			</view>
+			<view class="form-box inputs-flex" v-if="isChange">
+				<label class="form-label">最低易货量</label>
+				<input type="number" v-model="skus_number" placeholder="输入最低易货量"/>
+			</view>
+			<view class="form-box inputs-flex">
+				<label class="form-label">发行权证数</label>
+				<input type="number" v-model="skus_stock" placeholder="输入商品发行权证数"/>
+			</view>
+		</view>
+		<!-- 售后服务 -->
+		<view class="form-block">
+			<view class="form-box picker-flex">
+				<label class="form-label">配送方式</label>
+				<picker :range="logisticArr" range-key="text" :value="logisticType" @change="pickerChange($event, 'logisticType')">
+					<view class="picker-text">
+						{{logisticArr[logisticType].text}}
+						<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
+					</view>
+				</picker>
+			</view>
+			<view class="form-box picker-flex" v-if="logisticType === 1">
+				<label class="form-label">关联店铺</label>
+				<view class="picker-text" @click="opnePopup('storePopup')">
+					已关联{{stores.length}}家店铺<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
+				</view>
+			</view>
+			<view class="form-box picker-flex">
+				<label class="form-label">允许售后</label>
+				<view class="picker-switch">
+					<switch :checked="isPostSale" color="#e93340" @change="pickerChange($event, 'isPostSale')"/>
+				</view>
+			</view>
+			<view class="form-box picker-flex">
+				<label class="form-label">可选服务</label>
+				<view class="picker-text" @click="opnePopup('categoryPopup')">
+					已选{{services.length}}项服务<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
+				</view>
+			</view>
+		</view>
+		<!-- 售后服务 -->
+		<view class="form-block" v-if="type == 2">
+			<view class="form-box picker-flex">
+				<label class="form-label">到期时间</label>
+				<picker mode="date" :value="expiriedAt" @change="pickerChange($event, 'expiriedAt')">
+					<view class="picker-text">
+						{{expiriedAt || '选择服务到期时间'}}
+						<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
+					</view>
+				</picker>
+			</view>
+		</view>
+		<!-- 可选服务 -->
+		<uni-popup ref="categoryPopup">
+			<view class="category-popup">
+				<view class="header">
+					<view class="title">选择商品服务</view>
+				</view>
+				<view class="category-flex">
+					<view class="category-flex-item" :class="{'show' : item.check}" v-for="(item, index) in servicesArr" :key="index" @click="item.check = !item.check">
+						<view class="category-name">{{item.name}}</view>
+						<view class="category-content">{{item.content}}</view>
+					</view>
+				</view>
+				<view class="btns">
+					<button type="default" size="default" @click="affirmCategory('services', 'categoryPopup')">确定</button>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 选择店铺 -->
+		<uni-popup ref="storePopup">
+			<view class="category-popup">
+				<view class="header">
+					<view class="title">选择店铺</view>
+				</view>
+				<view class="category-flex">
+					<view class="category-flex-item" :class="{'show' : item.check}" v-for="(item, index) in storesArr" :key="index" @click="item.check = !item.check">
+						<view class="category-name">{{item.name}}</view>
+						<view class="category-content">{{item.address}}</view>
+					</view>
+				</view>
+				<view class="btns">
+					<button type="default" size="default" @click="affirmCategory('stores', 'storePopup')">确定</button>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 安全区 -->
+		<view class="ios-bottom"></view>
+		<!-- footer -->
+		<view class="footer">
+			<button class="footer-btn" type="default" @click="submitAdd">{{type == 2 ? '发布': '发布并认证'}}</button>
+			<view class="ios-bottom"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { managesGoodsCreate, managesCreate, managesGoodsEdit, managesGoodsPut } from '@/apis/interfaces/goods'
+	import { uploads } from '@/apis/interfaces/uploading'
+	export default {
+		data() {
+			return {
+				categoryId	: '',	 // 一级分类
+				categoryCid	: '',	 // 二级分类
+				name		: '',	 // 标题
+				pictures	: [], 	 // 轮播图
+				content		: [], 	 // 详情图
+				description	: '', 	 // 商品描述
+				isPostSale	: false, // 是否允许售后
+				services	: [],	 // 商品服务
+				skus_cost	: '',	 // 市场价格
+				skus_price	: '',	 // 销售价格
+				skus_number	: 1,	 // 易货起购数量
+				skus_unit	: '件',	 // 规格文字
+				skus_charge	: '',	 // 分销佣金
+				skus_stock	: '',	 // 库存
+				isChange	: false, // 是否支持易货
+				stores		: [],	 // 关联店铺
+				expiriedAt	: '',	 // 活动到期时间
+				logisticType: 0,	 // 配送方式
+				logisticArr : [
+					{text: '快递', type: 1},
+					{text: '自提', type: 2}
+				],
+				// 配置信息
+				storesArr	: [],    // 可选店铺
+				tags		: [],	 // 可选商品标签
+				tagsIndex	: 0,	 // 选择标签的下标
+				servicesArr	: [],	 // 可选服务
+				type		: 1,	 // 1为商品，2为服务
+			};
+		},
+		created() {
+			// 编辑状态信息
+			if(this.$Route.query.type && this.$Route.query.type === 'edit'){
+				managesGoodsEdit(this.$Route.query.id).then(res => {
+					let services = [], stores = []
+					let servicesArr = res.services.map(val => {
+						let check = (res.data.services.findIndex(obj => obj.service_id === val.service_id)) >= 0
+						if(check){
+							services.push(val.service_id)
+						}
+						return{
+							check,
+							...val
+						}
+					})
+					let storesArr = res.stores.map(val => {
+						let check = (res.data.stores.findIndex(obj => obj.store_id === val.store_id)) >= 0
+						if(check){
+							stores.push(val.store_id)
+						}
+						return {
+							check,
+							...val
+						}
+					})
+					this.categoryId	 = res.data.category.category_id
+					this.categoryCid = res.data.category_sub.category_id
+					this.name 		 = res.data.name
+					this.content	 = res.data.content
+					this.description = res.data.description
+					this.pictures	 = res.data.pictures
+					this.skus_cost	 = res.data.skus[0].cost
+					this.skus_price	 = res.data.skus[0].price
+					this.skus_number = res.data.skus[0].number
+					this.skus_unit	 = res.data.skus[0].unit
+					this.skus_charge = res.data.skus[0].charge
+					this.skus_stock	 = res.data.skus[0].stock
+					this.isPostSale	 = res.data.is_post_sale == 0
+					this.isChange	 = res.data.is_change == 0
+					this.logisticType= this.logisticArr.findIndex(val => val.type === res.data.logistic_type)
+					this.servicesArr = servicesArr
+					this.storesArr	 = storesArr
+					this.services	 = services
+					this.stores		 = stores
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+				return
+			}
+			// 添加配置信息
+			managesCreate({
+				category_cid: this.$Route.query.cid
+			}).then(res => {
+				res.services = res.services.map(val => {
+					return {
+						check: false,
+						...val
+					}
+				})
+				res.stores = res.stores.map(val => {
+					return {
+						check: false,
+						...val
+					}
+				})
+				this.storesArr 	= res.stores
+				this.tags		= res.tags
+				this.servicesArr= res.services
+				this.type		= res.type
+				this.categoryId	= this.$Route.query.id
+				this.categoryCid= this.$Route.query.cid
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		methods: {
+			// 选择商品服务
+			opnePopup(key){
+				this.$refs[key].open('bottom')
+			},
+			// 确认选择商品服务
+			affirmCategory(key, popupKey){
+				let keyArr = key == 'services' ? 'servicesArr' : 'storesArr'
+				this[key] = []
+				for(let val of this[keyArr]){
+					if(val.check){
+						this[key].push(val.service_id || val.store_id)
+					}
+				}
+				this.$refs[popupKey].close()
+			},
+			// picker选择
+			pickerChange(e, key){
+				this[key] = e.detail.value
+			},
+			// 图片预览
+			openImg(index, key){
+				let paths = this[key].map(val => {
+					return val.showpath
+				})
+				uni.previewImage({
+					urls	 : paths,
+					current	 : index,
+					indicator: 'number'
+				})
+			},
+			// 删除图片
+			removeImg(index, key){
+				this[key].splice(index, 1)
+			},
+			// 上传图片
+			updCover(key){
+				uni.chooseImage({
+					success	: res => {
+						let path = res.tempFiles.map((val, index) => {
+							return {
+								name: 'uploads' + index,
+								uri : val.path
+							}
+						})
+						uploads(path).then(updRes => {
+							for(let i in updRes.path){
+								this[key].push({
+									path	: updRes.path[i],
+									showpath: updRes.url[i]
+								})
+							}
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon : 'none'
+							})
+						})
+					}
+				})
+			},
+			// 发布产品
+			submitAdd(){
+				let pictures = this.pictures.map(val => {return val.path}),
+					content	 = this.content.map(val => {return val.path})
+
+				let submitData = {
+					name		 : this.name,
+					cover		 : this.pictures[0].path,
+					category_id	 : this.categoryId,
+					category_cid : this.categoryCid,
+					pictures	 : pictures,
+					content		 : content,
+					description	 : this.description,
+					is_post_sale : this.isPostSale ? 0 : 1,
+					services	 : this.services,
+					skus_cost	 : this.skus_cost,
+					skus_price	 : this.skus_price,
+					skus_number	 : this.skus_number,
+					skus_unit	 : this.skus_unit,
+					skus_charge	 : this.skus_charge,
+					skus_stock	 : this.skus_stock,
+					is_change	 : this.isChange ? 0 : 1,
+					logistic_type: this.logisticArr[this.logisticType].type,
+					stores		 : this.stores,
+					expiried_at	 : this.expiriedAt
+				}
+				
+				let submitFund = this.$Route.query.type === 'edit' ? managesGoodsPut(this.$Route.query.id, submitData) : managesGoodsCreate(submitData)
+				submitFund.then(res => {
+					if(this.type === 2){
+						uni.showModal({
+							title		: '提示',
+							content 	: '商品权证已发布，请耐心等待平台审核',
+							showCancel	: false,
+							success		: res => {
+								if(res.confirm){
+									this.$Router.back(this.$Route.query.type === 'edit' ? 1 : 2)
+								}
+							}
+						})
+						return
+					}
+					uni.showModal({
+						title		: '提示',
+						content 	: this.$Route.query.type === 'edit' ? '商品权证已更新，是否立即补充产品附加信息认证？' : '商品权证已发布，是否立即补充产品附加信息认证？',
+						cancelText	: '稍后认证',
+						confirmText	: '立即认证',
+						success		: res => {
+							if(res.cancel){
+								this.$Router.back(this.$Route.query.type === 'edit' ? 1 : 2)
+							}
+							if(res.confirm){
+								let goodsId = this.$Route.query.type === 'edit' ? this.$Route.query.id : res
+								this.$Router.push({name: 'goodsAuth', params: { id: goodsId , type: 'goodsAdd', edit: this.$Route.query.type === 'edit'}})
+							}
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		padding-bottom: 150rpx;
+	}
+	// 表单
+	.form-block{
+		background: white;
+		margin-top: $margin - 10;
+		.form-box{
+			position: relative;
+			padding-left: 240rpx;
+			padding-right: $padding;
+			font-size: $title-size-lg;
+			min-height: 80rpx;
+			&::after{
+				position: absolute;
+				bottom: 0;
+				left: $margin;
+				right: 0;
+				height: 1rpx;
+				content: " ";
+				background: $border-color;
+			}
+			&:last-child::after{
+				display: none;
+			}
+			.form-label{
+				position: absolute;
+				left: $margin;
+				line-height: 80rpx;
+				top: 0;
+				width: calc(240rpx - #{$margin});
+			}
+		}
+		.inputs-flex{
+			input{
+				height: 80rpx;
+				line-height: 80rpx;
+			}
+		}
+		.input-unit{
+			padding-right: 200rpx;
+			.units{
+				position: absolute;
+				right: 0;
+				top: 0;
+				line-height: 80rpx;
+				height: 80rpx;
+				width: 200rpx;
+				padding-right: $padding;
+				text-align: right;
+				box-sizing: border-box;
+			}
+		}
+		.picker-flex{
+			.picker-text{
+				position: relative;
+				line-height: 80rpx;
+				min-height: 80rpx;
+				padding-right: 80rpx;
+				@extend .nowrap;
+				.picker-icon{
+					right: 0;
+					position: absolute;
+				}
+			}
+			.picker-switch{
+				line-height: 80rpx;
+				min-height: 80rpx;
+				text-align: right;
+				margin-right: -15rpx;
+				switch{
+					transform:scale(0.7)
+				}
+			}
+		}
+		.form-upd{
+			.form-title{
+				font-size: $title-size-lg;
+				line-height: 80rpx;
+				padding: 0 $padding;
+				text{
+					font-size: 80%;
+					color: $text-gray;
+				}
+			}
+			.form-imgs{
+				margin-top: -($margin/3);
+				padding: 0 20rpx 20rpx;
+				display: flex;
+				flex-wrap: wrap;
+				.item{
+					width: calc(20% - 14rpx);
+					padding-top: calc(20% - 14rpx);
+					margin: 7rpx;
+					position: relative;
+					.item-cover{
+						position: absolute;
+						top: 0;
+						left: 0;
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.item-add{
+					border: dashed 2rpx $border-color;
+					box-sizing: border-box;
+					.item-cover{
+						top: calc(15% - 2rpx);
+						left: calc(15% - 2rpx);
+						width: 70%;
+						height: 70%;
+					}
+				}
+			}
+		}
+	}
+	// 发布
+	.footer{
+		background: white;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 20rpx $padding;
+		box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
+		z-index: 9;
+		.footer-btn{
+			border: none;
+			border-radius: 0;
+			background: $text-price;
+			height: 90rpx;
+			line-height: 90rpx;
+			font-weight: bold;
+			font-size: $title-size;
+			color: white;
+			&::after{
+				border: none;
+			}
+		}
+	}
+	// 可选服务
+	.category-popup{
+		background: #F5F5F5;
+		padding: 0 $padding * 2 $padding * 2 $padding * 2;
+		.header{
+			padding: $padding*2 0;
+			box-sizing: border-box;
+			@extend .vertical;
+			.title{
+				text-align: center;
+				font-size: $title-size + 14;
+				font-weight: bold;
+				line-height: 90rpx;
+			}
+			.subtitle{
+				font-size: $title-size-m;
+				color: $text-gray;
+				text-align: center;
+			}
+		}
+		.category-flex{
+			max-height: 50vh;
+			overflow-y: scroll;
+			.category-flex-item{
+				margin-bottom: $margin;
+				padding: $padding;
+				background: white;
+				border:solid 1rpx white;
+				box-sizing: border-box;
+				.category-name{
+					padding-bottom: $padding/2;
+					font-weight: bold;
+					font-size: $title-size-lg;
+				}
+				.category-content{
+					font-size: $title-size-sm;
+					color: $text-gray;
+					@extend .ellipsis;
+				}
+				&.show{
+					color: $text-price;
+					border:solid 1rpx $text-price;
+				}
+				&:last-child{
+					margin-bottom: 0;
+				}
+			}
+		}
+		.btns{
+			padding-top: $padding * 2;
+			button{
+				background: $text-price;
+				border-radius: 0;
+				height: 90rpx;
+				line-height: 90rpx;
+				font-size: $title-size;
+				color: white;
+				font-weight: bold;
+				&::after{
+					border: none;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/goods/addClassify.vue b/pages/goods/addClassify.vue
new file mode 100644
index 0000000..45b01b4
--- /dev/null
+++ b/pages/goods/addClassify.vue
@@ -0,0 +1,101 @@
+<template>
+	<view class="content-flex" v-if="!loding">
+		<scroll-view class="stair" scroll-y>
+			<view class="stair-item" :class="{'show': stairIndex == index}" v-for="(item, index) in category" :key="index" @click="stairIndex = index">{{item.name}}</view>
+			<view class="ios-bottom"></view>
+		</scroll-view>
+		<scroll-view class="second" scroll-y>
+			<view class="second-item" v-for="(item, index) in category[stairIndex].children" :key="index" @click="onCategory(item.category_id)">
+				{{item.name}}<uni-icons class="arrow-icon" type="arrowright" color="#999" size="14"></uni-icons>
+			</view>
+			<view class="ios-bottom"></view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import { managesCategory } from '@/apis/interfaces/goods'
+	export default {
+		data() {
+			return {
+				loding		: true,
+				category	: [],
+				stairIndex	: 0,
+				secondIndex : 0
+			};
+		},
+		created() {
+			managesCategory().then(res => {
+				console.log(res)
+				this.loding   = false
+				this.category = res
+			})
+		},
+		methods:{
+			// 选择分类
+			onCategory(cid){
+				this.$Router.push({name: 'GoodsMagAdd', params: {cid, id: this.category[this.stairIndex].category_id}})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-flex{
+		background-color: white;
+		height: 100vh;
+		display: flex;
+		font-size: $title-size-m;
+		.stair{
+			background: #F5F5F5;
+			width: 240rpx;
+			.stair-item{
+				text-align: center;
+				padding: 0 $padding;
+				line-height: 90rpx;
+				color: $text-gray;
+				@extend .nowrap;
+				&.show{
+					position: relative;
+					background: white;
+					color: $text-price;
+					font-weight: bold;
+					&::before{
+						position: absolute;
+						height: 40rpx;
+						width: 5rpx;
+						background: $text-price;
+						content: " ";
+						left: 0;
+						top: 20rpx;
+					}
+				}
+			}
+		}
+		.second{
+			width: calc(100% - 240rpx);
+			.second-item{
+				position: relative;
+				padding: 0 ($padding + 80) 0 $padding;
+				line-height: 90rpx;
+				color: $text-gray;
+				.arrow-icon{
+					position: absolute;
+					right: $padding;
+				}
+				&::after{
+					position: absolute;
+					height: 1rpx;
+					content: ' ';
+					background: $border-color;
+					left: $padding;
+					right: 0;
+					top: 0;
+				}
+				&:first-child::after{
+					display: none;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/goods/goodsAuth.vue b/pages/goods/goodsAuth.vue
new file mode 100644
index 0000000..320340f
--- /dev/null
+++ b/pages/goods/goodsAuth.vue
@@ -0,0 +1,375 @@
+<template>
+	<view class="content">
+		<view class="form-block">
+			<view class="form-upd">
+				<view class="form-title">产品实物图片<text>（点击预览，长按删除）</text></view>
+				<view class="form-imgs">
+					<view
+						class="item"
+						v-if="extendCover.length > 0"
+						@click="openImg"
+						@longpress="extendCover = []"
+					>
+						<image class="item-cover" :src="extendCover[0].showpath" mode="aspectFill"></image>
+					</view>
+					<view class="item item-add" v-else @click="updCover">
+						<image class="item-cover" src="@/static/icons/add-icon.png" mode="aspectFill"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品基本信息 -->
+		<view class="form-block">
+			<view class="form-box picker-flex">
+				<label class="form-label">生产日期</label>
+				<picker mode="date" :value="productedAt" @change="pickerChange($event, 'productedAt')">
+					<view class="picker-text">
+						{{productedAt || '选择商品生产日期'}}
+						<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
+					</view>
+				</picker>
+			</view>
+			<view class="form-box picker-flex">
+				<label class="form-label">过期时间</label>
+				<picker mode="date" :value="expiriedAt" @change="pickerChange($event, 'expiriedAt')">
+					<view class="picker-text">
+						{{expiriedAt || '选择商品过期时间'}}
+						<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
+					</view>
+				</picker>
+			</view>
+			<view class="form-box inputs-flex">
+				<label class="form-label">生产商名称</label>
+				<input type="text" v-model="productName" placeholder="输入商品生产商名称"/>
+			</view>
+			<view class="form-box inputs-flex">
+				<label class="form-label">生产许可证号</label>
+				<input type="text" v-model="lisence" placeholder="输入商品生产许可证号"/>
+			</view>
+			
+			<view class="form-box inputs-flex">
+				<label class="form-label">生产商地址</label>
+				<input type="text" v-model="productAddress" placeholder="输入商品生产商地址"/>
+			</view>
+		</view>
+		<!-- 安全区 -->
+		<view class="ios-bottom"></view>
+		<!-- footer -->
+		<view class="footer">
+			<button class="footer-btn" type="default" @click="submitAdd">提交认证审核</button>
+			<view class="ios-bottom"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { managesGoodsAuth, managesGoodsExtends } from '@/apis/interfaces/goods'
+	import { uploads } from '@/apis/interfaces/uploading'
+	export default {
+		data() {
+			return {
+				productedAt 	: '',  // 生产日期
+				expiriedAt  	: '',  // 过期时间
+				lisence	    	: '',  // 生产许可证号
+				productName		: '',  // 生产商名称
+				productAddress	: '',  // 生产商地址
+				extendCover		: []   // 实物图片
+			};
+		},
+		created() {
+			if(this.$Route.query.edit == 'true'){
+				managesGoodsExtends(this.$Route.query.id).then(res => {
+					this.productedAt 	= res.producted_at
+					this.expiriedAt  	= res.expiried_at
+					this.lisence	    = res.lisence
+					this.productName	= res.product_name
+					this.productAddress	= res.product_address
+					this.extendCover	= [{...res.cover}]
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+		},
+		methods: {
+			// picker选择
+			pickerChange(e, key){
+				this[key] = e.detail.value
+			},
+			// 图片预览
+			openImg(){
+				let paths = this.extendCover.map(val => {
+					return val.showpath
+				})
+				uni.previewImage({
+					urls	 : paths,
+					current	 : 0,
+					indicator: 'number'
+				})
+			},
+			// 上传图片
+			updCover(){
+				uni.chooseImage({
+					count	: 1,
+					success	: res => {
+						uploads([{
+							uri : res.tempFilePaths[0]
+						}]).then(updRes => {
+							this.extendCover.push({
+								path	: updRes.path[0],
+								showpath: updRes.url[0]
+							})
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon : 'none'
+							})
+						})
+					}
+				})
+			},
+			// 发布产品
+			submitAdd(){
+				let submitData = {
+					producted_at	: this.productedAt,
+					expiried_at		: this.expiriedAt,
+					lisence			: this.lisence,
+					product_name	: this.productName,
+					product_address	: this.productAddress,
+					extend_cover	: this.extendCover[0].path
+				}
+				let submitFund = managesGoodsAuth(this.$Route.query.id, submitData)
+				submitFund.then(res => {
+					uni.showModal({
+						title		: '提示',
+						content 	: '商品权证认证信息已提交，请耐心等待平台审核',
+						showCancel	: false,
+						success		: res => {
+							if(res.confirm){
+								if(this.$Route.query.type == 'goodsAdd'){
+									this.$Router.back(this.$Route.query.edit == 'true' ? 2 : 3)
+								}else{
+									this.$Router.back()
+								}
+							}
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		padding-bottom: 150rpx;
+	}
+	// 表单
+	.form-block{
+		background: white;
+		margin-top: $margin - 10;
+		.form-box{
+			position: relative;
+			padding-left: 240rpx;
+			padding-right: $padding;
+			font-size: $title-size-lg;
+			min-height: 80rpx;
+			&::after{
+				position: absolute;
+				bottom: 0;
+				left: $margin;
+				right: 0;
+				height: 1rpx;
+				content: " ";
+				background: $border-color;
+			}
+			&:last-child::after{
+				display: none;
+			}
+			.form-label{
+				position: absolute;
+				left: $margin;
+				line-height: 80rpx;
+				top: 0;
+				width: calc(240rpx - #{$margin});
+			}
+		}
+		.inputs-flex{
+			input{
+				height: 80rpx;
+				line-height: 80rpx;
+			}
+		}
+		.input-unit{
+			padding-right: 200rpx;
+			.units{
+				position: absolute;
+				right: 0;
+				top: 0;
+				line-height: 80rpx;
+				height: 80rpx;
+				width: 200rpx;
+				padding-right: $padding;
+				text-align: right;
+				box-sizing: border-box;
+			}
+		}
+		.picker-flex{
+			.picker-text{
+				position: relative;
+				line-height: 80rpx;
+				min-height: 80rpx;
+				padding-right: 80rpx;
+				@extend .nowrap;
+				.picker-icon{
+					right: 0;
+					position: absolute;
+				}
+			}
+			.picker-switch{
+				line-height: 80rpx;
+				min-height: 80rpx;
+				text-align: right;
+				margin-right: -15rpx;
+				switch{
+					transform:scale(0.7)
+				}
+			}
+		}
+		.form-upd{
+			.form-title{
+				font-size: $title-size-lg;
+				line-height: 80rpx;
+				padding: 0 $padding;
+				text{
+					font-size: 80%;
+					color: $text-gray;
+				}
+			}
+			.form-imgs{
+				margin-top: -($margin/3);
+				padding: 0 20rpx 20rpx;
+				display: flex;
+				flex-wrap: wrap;
+				.item{
+					width: calc(20% - 14rpx);
+					padding-top: calc(20% - 14rpx);
+					margin: 7rpx;
+					position: relative;
+					.item-cover{
+						position: absolute;
+						top: 0;
+						left: 0;
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.item-add{
+					border: dashed 2rpx $border-color;
+					box-sizing: border-box;
+					.item-cover{
+						top: calc(15% - 2rpx);
+						left: calc(15% - 2rpx);
+						width: 70%;
+						height: 70%;
+					}
+				}
+			}
+		}
+	}
+	// 发布
+	.footer{
+		background: white;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 20rpx $padding;
+		box-shadow: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .02);
+		z-index: 9;
+		.footer-btn{
+			border: none;
+			border-radius: 0;
+			background: $text-price;
+			height: 90rpx;
+			line-height: 90rpx;
+			font-weight: bold;
+			font-size: $title-size;
+			color: white;
+			&::after{
+				border: none;
+			}
+		}
+	}
+	// 可选服务
+	.category-popup{
+		background: #F5F5F5;
+		padding: 0 $padding * 2 $padding * 2 $padding * 2;
+		.header{
+			padding: $padding*2 0;
+			box-sizing: border-box;
+			@extend .vertical;
+			.title{
+				text-align: center;
+				font-size: $title-size + 14;
+				font-weight: bold;
+				line-height: 90rpx;
+			}
+			.subtitle{
+				font-size: $title-size-m;
+				color: $text-gray;
+				text-align: center;
+			}
+		}
+		.category-flex{
+			max-height: 50vh;
+			overflow-y: scroll;
+			.category-flex-item{
+				margin-bottom: $margin;
+				padding: $padding;
+				background: white;
+				border:solid 1rpx white;
+				box-sizing: border-box;
+				.category-name{
+					padding-bottom: $padding/2;
+					font-weight: bold;
+					font-size: $title-size-lg;
+				}
+				.category-content{
+					font-size: $title-size-sm;
+					color: $text-gray;
+					@extend .ellipsis;
+				}
+				&.show{
+					color: $text-price;
+					border:solid 1rpx $text-price;
+				}
+				&:last-child{
+					margin-bottom: 0;
+				}
+			}
+		}
+		.btns{
+			padding-top: $padding * 2;
+			button{
+				background: $text-price;
+				border-radius: 0;
+				height: 90rpx;
+				line-height: 90rpx;
+				font-size: $title-size;
+				color: white;
+				font-weight: bold;
+				&::after{
+					border: none;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/goods/management.vue b/pages/goods/management.vue
new file mode 100644
index 0000000..31470bd
--- /dev/null
+++ b/pages/goods/management.vue
@@ -0,0 +1,260 @@
+<template>
+	<view class="content">
+		<!-- 分类 -->
+		<view class="tabs">
+			<view class="item" :class="{'show': status == '0'}" @click="onTabs('0')">已发布</view>
+			<view class="item" :class="{'show': status == '1'}" @click="onTabs('1')">待认证</view>
+			<view class="item" :class="{'show': status == '2'}" @click="onTabs('2')">审核中</view>
+			<view class="item" :class="{'show': status == '3'}" @click="onTabs('3')">已驳回</view>
+		</view>
+		<!-- 优选商品 -->
+		<goodsList :list="goods" priceType="CNY" :status='status' toast="暂无产品权证">
+			<template v-slot:statistics="goods">
+				<view>库存{{goods.value.stock}}</view>
+			</template>
+			<template v-slot:footer="goods">
+				<view class="footer-btns">
+					<block v-if="status == '0'">
+						<button class="button-item" size="mini" @click="openLay(goods.value, 'goodsBurn')">燃烧</button>
+						<button class="button-item" size="mini" @click="openLay(goods.value, 'goodsMint')">增发</button>
+					</block>
+					<block v-if="status == '1'">
+						<button class="button-item" size="mini" @click="goodsAuth(goods.value.goods_id)">认证</button>
+						<button class="button-item" size="mini" @click="goodsRemove(goods.value.goods_id)">删除</button>
+					</block>
+					<block v-if="status == '2'">
+						<button class="button-item" size="mini" @click="goodsRemove(goods.value.goods_id)">删除</button>
+					</block>
+					<block v-if="status == '3'">
+						<button class="button-item" size="mini" @click="goodsPut(goods.value.goods_id, goods.value.reason)">驳回原因</button>
+						<button class="button-item" size="mini" @click="goodsRemove(goods.value.goods_id)">删除</button>
+					</block>
+				</view>
+			</template>
+		</goodsList>
+		<!-- 燃烧 增发 弹窗 -->
+		<uni-popup ref="popupLay" :safe-area="true" background-color="#ffffff">
+			<view class="popup">
+				<view class="title">库存{{stockType == 'goodsMint' ? '增发': '燃烧'}}</view>
+				<view class="des">
+					剩余库存
+					<text>{{itemGoods.stock}}</text>
+				</view>
+				<view class="des">
+					数量
+					<uni-number-box v-model='stock' :min="1" :max="stockType == 'goodsBurn' ? itemGoods.stock : 9999"></uni-number-box>
+				</view>
+				<view class="btn" @click="additionalOrBurning">确认</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import { managesGoodsIndex, managesGoodsDelete, managesGoodsBurn, managesGoodsMint, managesGoodsCreateBefore } from '@/apis/interfaces/goods'
+	import goodsList from '@/components/goods-list/goods-list'
+	export default {
+		components: {
+			goodsList
+		},
+		data() {
+			return {
+				status	  : 0,
+				goods	  : [],
+				pages	  : {},
+				itemGoods : {},
+				stock	  : 1,
+				stockType : ''
+			};
+		},
+		onShow() {
+			this.getList()
+		},
+		methods: {
+			// tabs
+			onTabs(value){
+				if(value == this.status) return
+				this.goods = []
+				this.status = value
+				this.getList()
+			},
+			// 权证列表
+			getList(){
+				managesGoodsIndex({
+					status: this.status
+				}).then(res => {
+					console.log(res)
+					this.goods = res.data
+					this.pages = res.page
+				})
+			},
+			// 修改产品
+			goodsPut(id, text){
+				uni.showModal({
+					title		: '驳回原因',
+					content		: text,
+					confirmText	: '编辑',
+					cancelText	: '确定',
+					success		: res => {
+						if(res.confirm){
+							this.$Router.push({name: 'GoodsMagAdd', params: {type: 'edit', id}})
+						}
+					}
+				})
+			},
+			// 商品认证
+			goodsAuth(id){
+				this.$Router.push({name: 'goodsAuth', params: {id, type: 'magList'}})
+			},
+			// 燃烧，增发
+			openLay(item, type){
+				this.itemGoods	= item
+				this.stockType	= type
+				this.stock		= 1
+				this.$refs.popupLay.open('bottom')
+			},
+			// 提交燃烧，增发
+			additionalOrBurning(){
+				let data = {
+					id	 : this.itemGoods.goods_id,
+					stock: this.stock
+				}
+				switch (this.stockType){
+					case 'goodsBurn':
+						managesGoodsBurn({...data}).then(res => {
+							let goodsIndex = this.goods.findIndex(val => val.goods_id === this.itemGoods.goods_id)
+							this.itemGoods.stock -= data.stock
+							this.$refs.popupLay.close()
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon : 'none'
+							})
+						})
+						break;
+					case 'goodsMint':
+						managesGoodsMint({...data}).then(res => {
+							let goodsIndex = this.goods.findIndex(val => val.goods_id === this.itemGoods.goods_id)
+							this.itemGoods.stock += data.stock
+							this.$refs.popupLay.close()
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon : 'none'
+							})
+						})
+						break;
+					default:
+						uni.showToast({
+							title: '类型错误',
+							icon : 'none'
+						})
+						break;
+				}
+			},
+			// 移出删除商品
+			goodsRemove(id){
+				let index = this.goods.findIndex(val => val.goods_id == id)
+				managesGoodsDelete(id).then(res => {
+					this.goods.splice(index,1)
+					if(this.goods.length === 0) this.getList()
+					uni.showToast({
+						title: '商品权证已删除',
+						icon : 'none'
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: 'none'
+					})
+				})
+			}
+		},
+		onNavigationBarButtonTap() {
+			this.$Router.push({name: 'addClassify'})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		padding-top: 90rpx;
+	}
+	// tabs
+	.tabs{
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 99;
+		display: flex;
+		justify-content: space-around;
+		background: white;
+		padding: 15rpx 0;
+		font-size: $title-size-lg;
+		color: $text-gray;
+		.item{
+			height: 60rpx;
+			line-height: 60rpx;
+			&.show{
+				color: $text-price;
+				border-bottom: solid 4rpx $text-price;
+			}
+		}
+	}
+	// 按钮组
+	.footer-btns{
+		display: flex;
+		justify-content: space-between;
+		padding-top: $padding/2;
+		margin-left: -10rpx;
+		margin-right: -10rpx;
+		.button-item[size='mini']{
+			padding: 0;
+			margin: 0 10rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			border-radius: 0;
+			flex: 1;
+			background: $border-color-lg;
+			color: $text-gray;
+			&::after{
+				border: none;
+			}
+		}
+	}
+	// 增发燃烧弹窗
+	.popup {
+		width: 100%;
+		background-color: #fff;
+		padding-bottom: $padding;
+		.title {
+			font-size: 36rpx;
+			text-align: center;
+			padding: 50rpx 30rpx 30rpx 30rpx;
+			font-weight: bold;
+		}
+		.btn {
+			background-color: $text-price;
+			height: 90rpx;
+			line-height: 90rpx;
+			text-align: center;
+			color: #fff;
+			font-weight: bold;
+			font-size: $title-size;
+			margin: $padding * 2;
+		}
+		.des {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
+			padding: $padding $padding * 2;
+			color: $text-gray;
+			text{
+				color: $text-color;
+			}
+		}
+	}
+</style>
diff --git a/pages/index/deal.vue b/pages/index/deal.vue
new file mode 100644
index 0000000..3533994
--- /dev/null
+++ b/pages/index/deal.vue
@@ -0,0 +1,173 @@
+<template>
+	<view>
+		<view class="deal-back"></view>
+		<!-- 区块信息 -->
+		<view class="block-shadow chian-hash">
+			<view class="title">区块HASH</view>
+			<view class="hash">{{info.hash || '-'}}</view>
+			<view class="button" @click="copyHash">复制</view>
+			<view class="chian-info">
+				<view class="item-flex">
+					<view class="label webkit-box">交易数据</view>
+					<view class="ellipsis">
+						{{ info.tx_count || '-' }}
+					</view>
+				</view>
+				<view class="item-flex">
+					<view class="label webkit-box">区块高度</view>
+					<view class="ellipsis">
+						{{ info.height || '-' }}
+					</view>
+				</view>
+				<view class="item-flex">
+					<view class="label webkit-box">时间</view>
+					<view class="ellipsis">
+						{{ info.block_time || '-' }}
+					</view>
+				</view>
+				<view class="item-flex webkit-box">
+					<view class="label">上一块</view>
+					<view class="ellipsis">
+						{{ info.parent_hash || '-' }}
+					</view>
+				</view>
+				<view class="item-flex webkit-box">
+					<view class="label">区块难度</view>
+					<view class="ellipsis">
+						{{ info.difficulty || '-' }}
+					</view>
+				</view>
+				<view class="item-flex webkit-box">
+					<view class="label">默克尔跟</view>
+					<view class="ellipsis">
+						{{ info.tx_hash || '-' }}
+					</view>
+				</view>
+				<view class="item-flex">
+					<view class="label">状态哈希</view>
+					<view class="ellipsis">
+						{{ info.state_hash || '-' }}
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 交易记录 -->
+		<view class="deals">
+			<view class="title">交易记录</view>
+			<deal-list :list="deal" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import { hash } from '@/apis/interfaces/chain'
+	import dealList from '@/components/chain/deal'
+	export default {
+		components:{
+			dealList
+		},
+		data() {
+			return {
+				info: {},
+				deal: [],
+			}
+		},
+		onLoad(e){
+			// 交易详情
+			if(e.hash && e.hash != '') hash(e.hash).then(res=>{
+				this.info = res.head
+				this.deal = res.trades
+			}).catch(err => {
+				uni.showToast({
+					icon: 'none',
+					title: '错误 22 line in chain/deal'
+				})
+			})
+			else uni.showToast({
+				icon: 'none',
+				title: 'hash值不存在，系统错误'
+			})
+		},
+		methods:{
+			copyHash(){
+				if(this.info.hash) uni.setClipboardData({
+					data: this.info.hash
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.block-shadow{
+		box-shadow: 0 0 2rpx 2rpx rgba($color: #000000, $alpha: .02);
+	}
+	// 背景
+	.deal-back {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: -1;
+		width: 100vw;
+		height: 100vh;
+		background: linear-gradient(to bottom, #009B69, #00562d);
+	}
+	// 区块详情
+	.chian-hash{
+		margin: $margin + ($margin/2);
+		background-color: white;
+		padding: ($padding * 3) ($padding * 2);
+		border-radius: $radius;
+		text-align: center;
+		.title{
+			font-size: $title-size + 8;
+			font-weight: bold;
+			color: $text-color;
+		}
+		.hash{
+			padding: $padding 0 ($padding*2) 0;
+			word-wrap: break-word;
+			color: $text-gray;
+		}
+		.button{
+			background-color: $red-color;
+			width: 50%;
+			display: inline-block;
+			height: 90rpx;
+			line-height: 90rpx;
+			color: white;
+			font-size: $title-size;
+			border-radius: 45rpx;
+			font-weight: bold;
+		}
+		.chian-info{
+			margin-top: $margin * 2;
+			background-color: $border-color-lg;
+			padding: $padding;
+			.item-flex{
+				padding-left: 220rpx;
+				text-align: right;
+				position: relative;
+				line-height: 70rpx;
+				min-height: 70rpx;
+				.label{
+					position: absolute;
+					left: 0;
+					width: 200rpx;
+					text-align: left;
+					color: $text-gray;
+				}
+			}
+		}
+	}
+	// 区块交易信息
+	.deals{
+		padding: $padding;
+		.title{
+			text-align: center;
+			font-weight: bold;
+			color: white;
+			font-size: $title-size;
+		}
+	}
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a691377..41cadb8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,19 +1,484 @@
 <template>
-	<view>
-		发现能量
+	<view class="content">
+		<!-- 水晶获得公告 -->
+		<view class="notice" v-if="notice.length >= 1">
+			<swiper class="notice-swiper" :vertical="true" autoplay circular>
+				<swiper-item v-for="(item, index) in notice" :key="index">
+					<view class="notice-item">
+						<image class="notice-cover" :src="item.avatar" mode="aspectFill"></image>
+						<view class="notice-title ellipsis">{{item.nickname}} {{item.title}} {{item.amount}}</view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<!-- 账户余额 -->
+		<view class="info">
+			<view class="info-number">
+				<image class="number-background number-rotate" src="@/static/background/chain-back-01.png" />
+				<view class="info-content webkit-box">
+					<view class="text">{{isAuth ? '持有原石量': '恒量发行原石量'}}<uni-icons class="help-icon" @click="showHelp('occ')" type="help-filled" size="18" color="#fff" /></view>
+					<view class="number">{{occ}}</view>
+					<view class="login" @click="$Router.push({name: 'Login'})" v-if="!isAuth">立即登录</view>
+					<view class="login" @click="openWallet" v-else>我的钱包</view>
+				</view>
+			</view>
+		</view>
+		<!-- 公告信息 -->
+		<!-- <view class="increase">今日消费100元，预计原石单价增长0.1%</view> -->
+		<!-- 平台概况 -->
+		<view class="situation">
+			<view class="header">
+				<view class="header-item">
+					<view class="title">平台原石余量<uni-icons class="help-icon" @click="showHelp('occBalance')" type="help-filled" size="18" color="#009b69" /></view>
+					<view class="number ellipsis">{{ occBalance }}</view>
+				</view>
+				<view class="header-item">
+					<view class="title">昨日瓜分水晶<uni-icons class="help-icon" @click="showHelp('yesterdayCrystal')" type="help-filled" size="18" color="#009b69" /></view>
+					<view class="number ellipsis">{{ yesterdayCrystal }}</view>
+				</view>
+				<view class="header-item">
+					<view class="title">区块链高度<uni-icons class="help-icon" @click="showHelp('blockHeight')" type="help-filled" size="18" color="#009b69" /></view>
+					<view class="number ellipsis">{{ blockHeight }}</view>
+				</view>
+				<view class="header-item">
+					<view class="title">平台累计盈利额<uni-icons class="help-icon" @click="showHelp('gain')" type="help-filled" size="18" color="#009b69" /></view>
+					<view class="number ellipsis">{{ gain }}</view>
+				</view>
+				<view class="header-item">
+					<view class="title">已开通节点数<uni-icons class="help-icon" @click="showHelp('nodeNumber')" type="help-filled" size="18" color="#009b69" /></view>
+					<view class="number ellipsis">{{ nodeNumber }}</view>
+				</view>
+			</view>
+			<!-- 节点信息 -->
+			<view class="node-info">
+				<view class="node-item">
+					<view class="title">轻节点</view>
+					<view class="number ellipsis">{{occs.light || '-'}}</view>
+				</view>
+				<view class="node-item">
+					<view class="title">合作节点</view>
+					<view class="number ellipsis">{{occs.cooperation || '-'}}</view>
+				</view>
+				<view class="node-item">
+					<view class="title">主节点</view>
+					<view class="number ellipsis">{{occs.main || '-'}}</view>
+				</view>
+				<view class="node-item">
+					<view class="title">超级节点</view>
+					<view class="number ellipsis">{{occs.super || '-'}}</view>
+				</view>
+				<view class="node-item">
+					<view class="title">运营节点</view>
+					<view class="number ellipsis">{{occs.operating || '-'}}</view>
+				</view>
+				<view class="node-item">
+					<view class="title">技术节点</view>
+					<view class="number ellipsis">{{occs.technology || '-'}}</view>
+				</view>
+			</view>
+			<!-- 平台盈利额，原石数量 -->
+			<view class="chart">
+				<view class="title">平台累计营业额和原石价值走势图</view>
+				<view class="chart-f2">
+					<l-f2 ref="chartChange"></l-f2>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
+	import { occ } from '@/apis/interfaces/chain'
+	import { certified, security } from '@/apis/interfaces/index'
+	import F2 from '@/uni_modules/lime-f2/components/lime-f2/f2.min.js'
+	import lF2 from '@/uni_modules/lime-f2/components/lime-f2/'
 	export default {
+		components: {
+			lF2
+		},
 		data() {
 			return {
-				
+				occs: {},
+				blockHeight: 0,
+				occBalance: 0,
+				occ: 0,
+				yesterdayCrystal: 0,
+				gain: 0,
+				nodeNumber: 0,
+				notice: [],
+				isAuth: false,
+				helpToast: {
+					occ: '恒量发行原石量',
+					occBalance: '平台原石量',
+					yesterdayCrystal: '昨日瓜分水晶',
+					blockHeight: '区块链高度',
+					gain: '平台累计盈利额',
+					nodeNumber: '已开通节点数'
+				}
 			};
+		},
+		onShow() {
+			if(this.$store.state.token != '') this.isAuth = true
+			this.getOcc()
+		},
+		methods:{
+			// 求助信息
+			showHelp(type) {
+				uni.showModal({
+				    title: '提示',
+				    content: this.helpToast[type],
+					showCancel: false
+				})
+			},
+			// 原石钱包
+			openWallet(){
+				Promise.all([certified(), security()]).then(res=> {
+					let certified = res[0],
+						security  = res[1]
+					if(!certified){
+						uni.showModal({
+							title: '提示',
+							content: '您还为完成个人认证，无法激活您的钱包',
+							confirmText: '去认证',
+							confirmColor: '#009B69',
+							cancelColor: '#666666',
+							cancelText: '稍后再说',
+							success: res=> {
+								if(res.confirm) {
+									uni.navigateTo({
+										url: '/pages/certification/personal'
+									})
+								}
+							}
+						})
+						return
+					}
+					if(!security) {
+						uni.showModal({
+							title: '激活提示',
+							content: '您的钱包未激活，是否立即导出助记词并激活您的钱包?',
+							confirmText: '去激活',
+							confirmColor: '#009B69',
+							cancelColor: '#666666',
+							cancelText: '稍后再说',
+							success: res=> {
+								if(res.confirm) {
+									uni.navigateTo({
+										url: '/pages/wallet/add'
+									})
+								}
+							}
+						})
+						return
+					}
+					uni.navigateTo({
+						url: '/pages/wallet/property'
+					})
+				})
+			},
+			// occ信息
+			getOcc(){
+				occ().then(res => {
+					this.occs = res.occs
+					this.yesterdayCrystal = res.yesterday_crystal
+					this.occ = res.occ
+					this.occBalance = res.occ_balance
+					this.blockHeight = res.block_height
+					this.gain = res.gain
+					this.nodeNumber = res.node_number
+					this.notice = res.notice
+					if(res.help_toast) this.helpToast = res.help_toast
+					this.showCartc(res.movements)
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+			// 绘制图表
+			showCartc(data){
+				// 图表信息
+				this.$refs.chartChange.init(config => {
+					config.appendPadding = [10, 15, 10, 15]
+					
+					const chart = new F2.Chart(config);
+					chart.source(data, {
+						date: {
+							range: [0, 1],
+							type: 'timeCat',
+							mask: 'MM-DD'
+						},
+						value: {
+							tickCount: 5
+						}
+					});
+					chart.axis('time', {
+						line: null,
+						label: function label(text, index, total) {
+							const textCfg = {};
+							if (index === 0) {
+								textCfg.textAlign = 'left';
+							} else if (index === total - 1) {
+								textCfg.textAlign = 'right';
+							}
+							return textCfg;
+						}
+					});
+					chart.axis('tem', {
+						grid: function grid(text) {
+							if (text === '0%') {
+								return {
+									lineDash: null,
+									lineWidth: 1
+								};
+							}
+						}
+					});
+					chart.tooltip({
+						showCrosshairs: true
+					});
+					chart.legend({
+						position: 'bottom',
+						offsetY: 0,
+						offsetX: 30
+					});
+					chart.area()
+						.position('date*value')
+						.color('name', [ '#009b69', '#9f8052' ])
+						.shape('smooth')
+					chart.line()
+						.position('date*value')
+						.color('name', [ '#009b69', '#9f8052' ])
+						.shape('smooth', name=> {
+							if (name === '预期收益率') {
+								return 'line';
+							}
+							if (name === '实际收益率') {
+								return 'dash';
+							}
+						});
+						chart.render();
+					return chart;
+				})
+			}
 		}
 	}
 </script>
 
-<style lang="scss">
-
+<style scoped>
+	/* 气泡漂浮 */
+	.number-float{
+		animation: 4s octfloat infinite;
+	}
+	@keyframes octfloat{
+		0%{
+			margin-top: 0;
+		}
+		50%{
+			margin-top: 15rpx;
+		}
+		100%{
+			margin-top: 0;
+		}
+	}
+	/* 背景旋转 */
+	.number-rotate{
+		animation: 30s octrotate infinite linear;
+	}
+	@keyframes octrotate{
+		from{
+			transform:rotate(0deg);
+		}
+		to{
+			transform:rotate(360deg);
+		}
+	}
+</style>
+
+<style lang="scss">
+	// 背景
+	.content{
+		background: $mian-color-deep;
+		min-height: 100vh;
+		padding-top: var(--status-bar-height);
+		box-sizing: border-box;
+		background-image: url(@/static/background/chain-back-00.png);
+		background-size: 100%;
+		background-position: top center;
+		background-repeat: no-repeat;
+	}
+	// 求助icon
+	.help-icon{
+		vertical-align: middle;
+		margin-bottom: 4px;
+		margin-left: $margin/2;
+		opacity: .7;
+	}
+	// 原石账户
+	.info{
+		margin-top: calc(#{$margin * 2} + 60rpx);
+		padding: var(--status-bar-height) $padding * 2 $padding * 3;
+		text-align: center;
+		.info-number{
+			position: relative;
+			display: inline-block;
+			width: 568rpx;
+			height: 568rpx;
+			.number-background{
+				width: 100%;
+				height: 100%;
+			}
+			.info-content{
+				position: absolute;
+				top: 12%;
+				left: 12%;
+				width: 76%;
+				height: 76%;
+				background-image: url(@/static/background/chain-back-02.png);
+				background-size: cover;
+				color: white;
+				.text{
+					font-size: $title-size-m;
+					text-shadow: 2rpx 2rpx 0 rgba($color: $mian-color-deep, $alpha: .5);
+				}
+				.number{
+					font-weight: bold;
+					font-size: $title-size + 8;
+					line-height: 70rpx;
+					text-shadow: 2rpx 2rpx 0 rgba($color: $mian-color-deep, $alpha: .5);
+				}
+				.login{
+					margin-top: $margin;
+					background-color: $mian-color;
+					display: inline-block;
+					padding: ( $padding / 2 ) $padding;
+					font-size: $title-size-m;
+					border-radius: 30rpx;
+					border:solid 1rpx $mian-color-deep;
+				}
+			}
+		}
+	}
+	// 预计增长
+	.increase{
+		margin: 0 ($margin + $margin / 2) ($margin * 2);
+		background: rgba($color: $mian-color, $alpha: .1);
+		text-align: center;
+		height: 80rpx;
+		line-height: 80rpx;
+		font-size: $title-size-m;
+		color: $mian-color;
+		border-radius: $radius-sm;
+		padding: 0 $padding;
+	}
+	// 公告信息
+	.notice{
+		position: fixed;
+		top: $margin * 2;
+		left: $margin + $margin / 2;
+		right: $margin + $margin / 2;
+		padding-top: var(--status-bar-height);
+		z-index: 99;
+		.notice-swiper{
+			height: 60rpx;
+		}
+		.notice-item{
+			position: relative;
+			height: 60rpx;
+			padding-left: 80rpx;
+			padding-right: $padding * 2;
+			display: inline-block;
+			background: rgba($color: $mian-color-deep, $alpha: .3);
+			border-radius: 30rpx;
+			box-sizing: border-box;
+			max-width: 100%;
+			.notice-cover{
+				position: absolute;
+				height: 60rpx;
+				width: 60rpx;
+				left: 0;
+				top: 0;
+				background-color: $mian-color-deep;
+				border-radius: 50%;
+			}
+			.notice-title{
+				line-height: 60rpx;
+				color: white;
+				font-size: $title-size-m;
+			}
+		}
+	}
+	// 平台概况
+	.situation{
+		margin: 0 ($margin + $margin / 2);
+		background-image: linear-gradient(to bottom, rgba($color: $mian-color, $alpha: .1), $mian-color-deep);
+		border-radius: $radius-sm;
+		padding: $padding;
+		// 平台统计
+		.header{
+			display: flex;
+			flex-wrap: wrap;
+			margin-bottom: $margin*2;
+			.number{
+				color: white;
+				font-size: $title-size + 4;
+				font-weight: bold;
+				line-height: 90rpx;
+			}
+			.title{
+				color: $mian-color;
+				font-weight: bold;
+				font-size: $title-size-sm;
+			}
+			.header-item{
+				width: 50%;
+				padding: $padding $padding / 2;
+				box-sizing: border-box;
+				&:first-child{
+					width: 100%;
+					.number{
+						font-size: $title-size + 10;
+					}
+				}
+			}
+		}
+		// 节点信息
+		.node-info{
+			display: flex;
+			flex-wrap: wrap;
+			margin: 0 -$margin / 2;
+			.node-item{
+				background: rgba($color: $mian-color, $alpha: .2);
+				width: calc(50% - #{$margin});
+				margin: $margin / 2;
+				padding: $padding;
+				box-sizing: border-box;
+				border-radius: $radius-sm;
+			}
+			.number{
+				font-size: $title-size + 4;
+				font-weight: bold;
+				color: white;
+			}
+			.title{
+				font-size: $title-size-m;
+				font-weight: bold;
+				color: rgba($color: white, $alpha: .7);
+			}
+		}
+		// 图表
+		.chart{
+			background: rgba($color: $mian-color, $alpha: .2);
+			padding: $padding;
+			border-radius: $radius-sm;
+			margin-top: $margin*2;
+			.title{
+				text-align: center;
+				line-height: 80rpx;
+				color: rgba($color: $mian-color, $alpha: 1.0);
+				font-size: $title-size-m;
+			}
+			.chart-f2{
+				height: 200px;
+			}
+		}
+	}
 </style>
diff --git a/pages/index/info.vue b/pages/index/info.vue
new file mode 100644
index 0000000..7f6d803
--- /dev/null
+++ b/pages/index/info.vue
@@ -0,0 +1,209 @@
+<template>
+	<view>
+		<!-- 区块信息 -->
+		<view class="info-back"></view>
+		<view class="info-list">
+			<view class="flex" v-for="(item, index) in assetsList" :key="index">
+				<view class="item-name ellipsis">
+					<image class="icon" :src="item.icon" mode="widthFix" />
+					{{ item.name || '-' }}
+				</view>
+				<view class="item-label">
+					<view class="number ellipsis">{{ item.balance || '0.00' }}</view>
+					<view class="unit ellipsis">{{ item.symbol || '-' }}</view>
+				</view>
+			</view>
+		</view>
+		<!-- 区块链变化 -->
+		<view class="movements">
+			<view class="title">区块链变化</view>
+			<view class="chart">
+				<l-f2 ref="chartChange"></l-f2>
+			</view>
+		</view>
+		<!-- 区块记录 -->
+		<view class="chain-record">
+			<view class="title">区块记录</view>
+			<chain-list :list="chainList" @onChain="chainInfo"/>
+		</view>
+		<!-- 底部安全区 -->
+		<view class="ios-bottom"></view>
+	</view>
+</template>
+
+<script>
+	import { chain, situation } from '@/apis/interfaces/chain'
+	import chainList from '@/components/chain/chain'
+	import F2 from '@/uni_modules/lime-f2/components/lime-f2/f2.min.js'
+	import lF2 from '@/uni_modules/lime-f2/components/lime-f2/'
+	export default {
+		components: {
+			chainList,
+			lF2
+		},
+		data() {
+			return {
+				data: [{
+					time: '2021-08-08 00:00:00',
+					value: 30
+				}, {
+					time: '2021-08-09 00:10:00',
+					value: 36
+				}, {
+					time: '2021-08-10 00:12:00',
+					value: 38
+				}, {
+					time: '2021-08-11 10:32:00',
+					value: 40
+				}, {
+					time: '2021-08-13 12:30:00',
+					value: 40
+				}, {
+					time: '2021-08-14 11:02:00',
+					value: 41
+				}, {
+					time: '2021-08-15 10:02:00',
+					value: 41
+				}],
+				assetsList: [],
+				chainList: []
+			};
+		},
+		mounted() {
+			Promise.all([chain(), situation()]).then(res => {
+				this.chainList = res[0]
+				this.assetsList = res[1].assets
+			}).catch(err => {
+				uni.showToast({
+					icon: 'none',
+					title: 'err in chain/info.vue ' + err
+				})
+			})
+			this.$refs.chartChange.init(config => {
+				const chart = new F2.Chart(config);
+					chart.source(this.data, {
+					time: {
+						type: 'timeCat',
+						tickCount: 3,
+						range: [ 0, 1 ]
+					},
+					value: {
+						tickCount: 5,
+						min: 0
+					}
+				});
+				chart.axis('time', {
+					label: function label(text, index, total) {
+						const textCfg = {};
+						if (index === 0) {
+						textCfg.textAlign = 'left';
+						} else if (index === total - 1) {
+						textCfg.textAlign = 'right';
+						}
+						return textCfg;
+					}
+				});
+				chart.tooltip({
+					showCrosshairs: true
+				});
+				chart.area()
+					.position('time*value')
+					.color('l(90) 0:#009b69 1:#f7f7f7')
+					.shape('smooth');
+					chart.line()
+					.position('time*value')
+					.color('l(90) 0:#009b69 1:#f7f7f7')
+					.shape('smooth');
+					chart.render();
+				return chart;
+			})
+		},
+		methods: {
+			// 区块详情
+			chainInfo(e){
+				uni.navigateTo({
+					url: './deal?hash=' + e.hash
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	// 背景
+	.info-back {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: -1;
+		width: 100vw;
+		height: 100vh;
+		background: linear-gradient(to bottom, #009B69, #00562d);
+	}
+
+	// 区块信息
+	.info-list {
+		padding: 0 $padding;
+
+		.flex {
+			margin: $margin * 2 $margin/2;
+			background-color: white;
+			border-radius: $radius;
+			padding: $padding * 2;
+			box-shadow: 0 0 2rpx 2rpx rgba($color: #000000, $alpha: .02);
+			display: flex;
+			justify-content: space-between;
+
+			.item-name {
+				width: 50%;
+				font-size: $title-size;
+
+				.icon {
+					width: 38rpx;
+					height: 38rpx;
+					vertical-align: middle;
+					margin-bottom: 5rpx;
+					margin-right: $margin;
+				}
+			}
+
+			.item-label {
+				width: 50%;
+				padding-left: $padding;
+				text-align: right;
+
+				.number {
+					font-weight: bold;
+					font-size: $title-size;
+				}
+
+				.unit {
+					font-size: $title-size-m;
+				}
+			}
+		}
+	}
+
+	// 区块链信息
+	.chain-record,
+	.movements {
+		padding: $padding;
+
+		.title {
+			font-weight: bold;
+			text-align: center;
+			color: white;
+			font-size: $title-size;
+			padding-bottom: $padding;
+		}
+	}
+
+	.movements {
+		.chart {
+			background-color: white;
+			margin: $margin/2;
+			height: 350rpx;
+			border-radius: $radius;
+		}
+	}
+</style>
diff --git a/pages/index/kline.vue b/pages/index/kline.vue
new file mode 100644
index 0000000..b0a2013
--- /dev/null
+++ b/pages/index/kline.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="kline">
+		<l-f2 ref="chart"></l-f2>
+	</view>
+</template>
+
+<script>
+	import F2 from '@/uni_modules/lime-f2/components/lime-f2/f2.min.js'
+	import lF2 from '@/uni_modules/lime-f2/components/lime-f2/'
+	export default {
+		components: {
+			lF2,
+		},
+		data() {
+			return {
+			}
+		},
+		async mounted() {
+			let data = await this.getData()
+			// 绘制K线
+			this.$refs.chart.init(config => {
+				data = data.slice(0, 150);
+				const BASIC_PRICE = 6.95;
+				data.sort(function(obj1, obj2) {
+					return obj1.time > obj2.time ? 1 : -1;
+				});
+				data.forEach(function(obj) {
+					obj.range = [obj.start, obj.end, obj.max, obj.min];
+					obj.trend = obj.start <= obj.end ? 0 : 1;
+				});
+				const chart = new F2.Chart(Object.assign(config));
+				chart.source(data, {
+					range: {
+						tickCount: 5,
+						formatter: function formatter(val) {
+							return val.toFixed(2);
+						}
+					},
+					time: {
+						tickCount: 3
+					}
+				});
+				chart.tooltip({
+					showCrosshairs: true,
+					showXTip: true,
+					showYTip: true,
+					crosshairsType: 'xy',
+					custom: true,
+					yTip: function yTip(val) {
+						return {
+							text: val.toFixed(2),
+							fill: '#333',
+							fontSize: 10
+						};
+					},
+			
+					xTip: {
+						fill: '#333',
+						fontSize: 10
+					},
+					xTipBackground: {
+						fill: '#EDF2FE'
+					},
+					yTipBackground: {
+						fill: '#EDF2FE'
+					},
+					crosshairsStyle: {
+						stroke: '#0F8DE8'
+					}
+				});
+				chart.axis('range', {
+					grid: {
+						stroke: '#ddd',
+						lineWidth: 1,
+						lineDash: null
+					},
+					label: {
+						fill: '#999'
+					}
+				});
+				chart.axis('time', {
+					label: function label(text, index, total) {
+						const textCfg = {
+							fill: '#999'
+						};
+						if (index === 0) {
+							textCfg.textAlign = 'left';
+						}
+						if (index === total - 1) {
+							textCfg.textAlign = 'right';
+						}
+						return textCfg;
+					},
+			
+					grid: {
+						lineWidth: 1,
+						stroke: '#ddd'
+					}
+				});
+				chart.guide().line({
+					start: ['min', BASIC_PRICE],
+					end: ['max', BASIC_PRICE],
+					style: {
+						lineDash: [8],
+						stroke: '#F68300'
+					}
+				});
+				chart.guide().text({
+					position: ['min', BASIC_PRICE],
+					content: BASIC_PRICE,
+					style: {
+						fill: '#808080',
+						textAlign: 'start',
+						textBaseline: 'bottom',
+						fontSize: 10,
+						fontWeight: 'bold'
+					},
+					offsetX: 2
+				});
+				chart.guide().rect({
+					start: ['0%', '0%'],
+					end: ['100%', '100%'],
+					style: {
+						stroke: '#ddd',
+						lineWidth: 1,
+						fill: '#fff',
+						opacity: 1,
+						fillOpacity: 0
+					}
+				});
+				chart.schema()
+					.position('time*range')
+					.color('trend', function(trend) {
+						return ['#F4333C', '#1CA93D'][trend];
+					})
+					.shape('candle');
+				chart.render();
+				return chart;
+			});
+		},
+		methods: {
+			getData() {
+				// plus.screen.lockOrientation('landscape-primary')
+				return new Promise((resolve) => {
+					uni.request({
+						url: 'https://gw.alipayobjects.com/os/antfincdn/c4ROEPcthk/candle-sticks.json',
+						success: (res) => {
+							resolve(res.data)
+						}
+					})
+				})
+			}
+		},
+		onUnload() {
+			console.log('222')
+		}
+	}
+</script>
+
+<style lang="scss">
+	.kline{
+	}
+</style>
diff --git a/pages/instrument/basics.vue b/pages/instrument/basics.vue
new file mode 100644
index 0000000..db402a1
--- /dev/null
+++ b/pages/instrument/basics.vue
@@ -0,0 +1,525 @@
+<template>
+	<view class="ios-bottom">
+		<view class="info">
+			<view class="item info-logo" @click="updImg('logo', '')">
+				<label>企业LOGO</label>
+				<image :src="logo" mode="aspectFill"></image>
+				<uni-icons class="icon" color="#999" size="18" type="arrowright"></uni-icons>
+			</view>
+			<view class="item info-text">
+				<label>企业简介</label>
+				<textarea v-model="description" placeholder="输入企业简介" />
+			</view>
+			<view class="item info-text">
+				<label>企业地址</label>
+				<input v-model="address" placeholder="输入企业地址" />
+			</view>
+		</view>
+		<block v-for="(module, moduleIndex) in modules" :key="moduleIndex">
+			<view class="module-item" v-if="module.type === 1">
+				<view class="module-title">
+					<input class="title-input" type="text" v-model="module.title" placeholder="输入标题" />
+					<view class="remove-btn" @click="removeModule(moduleIndex)">删除</view>
+				</view>
+				<view class="module-textarea">
+					<textarea placeholder="输入文字内容" v-model="module.content.content" />
+				</view>
+			</view>
+			<view class="module-item" v-if="module.type === 2">
+				<view class="module-title">
+					<input class="title-input" type="text" v-model="module.title" placeholder="输入标题" />
+					<view class="remove-btn" @click="removeModule(moduleIndex)">删除</view>
+				</view>
+				<view class="module-imgs">
+					<view
+						class="item"
+						v-for="(item, index) in module.content.image"
+						:key="index"
+					>
+						<image
+							class="cover"
+							:src="item.showpath"
+							mode="aspectFill"
+							@click="openImg(module.content.image, index, 'imgs')"
+							@longpress="removeImg('imgs', moduleIndex, index)"
+						/>
+						<view class="item-input">
+							<input type="text" v-model="item.title" placeholder="输入标题" />
+						</view>
+					</view>
+					<view class="item" @click="updImgs(moduleIndex)">
+						<view class="item-upd cover">
+							<uni-icons type="plus" size="20" color="#999"/>
+							<view>上传图片</view>
+						</view>
+					</view>
+				</view>
+				<view class="module-hint">点击查看图片，长按删除图片</view>
+			</view>
+			<view class="module-item" v-if="module.type === 3">
+				<view class="module-title">
+					<input class="title-input" type="text" v-model="module.title" placeholder="输入标题" />
+					<view class="remove-btn" @click="removeModule(moduleIndex)">删除</view>
+				</view>
+				<view class="module-videos">
+					<view class="item">
+						<block v-if="module.content.video_image.showpath != ''">
+							<image
+								class="cover"
+								:src="module.content.video_image.showpath"
+								mode="aspectFill"
+								@click="openImg([module.content.video_image.showpath], 0, 'videos')"
+								@longpress="removeImg('videoCover', moduleIndex, '')"
+							/>
+						</block>
+						<block v-else>
+							<view class="item-upd" @click="updImg('videoCover', moduleIndex)">
+								<uni-icons type="plus" size="20" color="#999"/>
+								<view>上传视频封面</view>
+							</view>
+						</block>
+					</view>
+					<view class="item">
+						<video
+							class="cover"
+							v-if="module.content.video_url.showpath != ''"
+							:src="module.content.video_url.showpath"
+							@longpress="removeImg('video', moduleIndex, '')"
+						/>
+						<view class="item-upd" @click="updImg('video', moduleIndex)" v-else>
+							<uni-icons type="plus" size="20" color="#999"/>
+							<view>上传视频</view>
+						</view>
+					</view>
+				</view>
+				<view class="module-hint">点击查看封面/视频，长按删除封面/视频</view>
+			</view>
+		</block>
+		<view class="add-modules" @click="addModule">
+			<uni-icons class="icon" type="plus" size="18" color="#c82626"/> 添加展示模块
+		</view>
+	</view>
+</template>
+
+<script>
+	import { basicsInfo, basicsConfig } from '@/apis/interfaces/store'
+	import { uploads } from '@/apis/interfaces/uploading'
+	export default {
+		data() {
+			return {
+				logo		: '',
+				description	: '',
+				address		: '',
+				modules		: [],
+				modulesType	: []
+			};
+		},
+		created() {
+			Promise.all([basicsInfo('GET', {}), basicsConfig()]).then(res => {
+				console.log(res)
+				
+				let info 	= res[0]
+				this.logo	 	 = info.base.cover
+				this.description = info.base.description
+				this.modules	 = info.extends
+				this.address	 = info.info.address
+				this.modulesType = res[1]
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		methods:{
+			// 图片预览
+			openImg(paths, index, type){
+				if(type === 'imgs'){
+					paths = paths.map(val => {
+						return val.showpath
+					})
+				}
+				uni.previewImage({
+					urls	 : paths,
+					current	 : index,
+					indicator: 'number'
+				})
+			},
+			// 删除图片
+			removeImg(type, moduleIndex, index){
+				let modulesObj = this.modules[moduleIndex]
+				if(type === 'videoCover'){
+					modulesObj.content.video_image.showpath = ''
+					modulesObj.content.video_image.path = ''
+				}
+				if(type === 'imgs'){
+					modulesObj.content.image.splice(index, 1)
+				}
+				if(type === 'video'){
+					modulesObj.content.video_url.showpath = ''
+					modulesObj.content.video_url.path = ''
+				}
+				this.$set(this.modules, moduleIndex, modulesObj)
+			},
+			// 单图上传
+			updImg(type, index){
+				switch(type){
+					case 'logo':
+						uni.chooseImage({
+							crop: {width: 300, height: 300},
+							success: path=> {
+								uploads([{
+									name: 'logo',
+									uri : path.tempFilePaths[0]
+								}]).then(res => {
+									this.logo = res.url[0]
+								}).catch(err => {
+									uni.showToast({
+										title: err.message,
+										icon : 'none'
+									})
+								})
+							}
+						})
+						break
+					case 'videoCover':
+						uni.chooseImage({
+							crop: {width: 500, height: 350},
+							success: path=> {
+								uploads([{
+									name: 'logo',
+									uri : path.tempFilePaths[0]
+								}]).then(res => {
+									let modulesObj = this.modules[index]
+									modulesObj.content.video_image.showpath = res.url[0]
+									modulesObj.content.video_image.path = res.path[0]
+									this.$set(this.modules, index, modulesObj)
+								}).catch(err => {
+									uni.showToast({
+										title: err.message,
+										icon : 'none'
+									})
+								})
+							}
+						})
+						break
+					case 'video':
+						uni.chooseVideo({
+							success: path=> {
+								uploads([{
+									name: 'video',
+									uri : path.tempFilePath
+								}]).then(res => {
+									let modulesObj = this.modules[index]
+									modulesObj.content.video_url.showpath = res.url[0]
+									modulesObj.content.video_url.path = res.path[0]
+									this.$set(this.modules, index, modulesObj)
+								}).catch(err => {
+									uni.showToast({
+										title: err.message,
+										icon : 'none'
+									})
+								})
+							}
+						})
+						break
+				}
+			},
+			// 批量上传图片
+			updImgs(index){
+				uni.chooseImage({
+					success: res=>{
+						let path = res.tempFiles.map((val, index) => {
+							return {
+								name: 'uploads' + index,
+								uri : val.path
+							}
+						})
+						uploads(path).then(pathRes => {
+							let modulesObj = this.modules[index],
+								paths	   = []
+							for(let i in pathRes.path){
+								paths.push({
+									showpath: pathRes.url[i],
+									path	: pathRes.path[i],
+									title	: ''
+								})
+							}
+							modulesObj.content.image = [...modulesObj.content.image, ...paths]
+							this.$set(this.modules, index, modulesObj)
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon : 'none'
+							})
+						})
+					}
+				})
+			},
+			// 添加展示模块
+			addModule(){
+				let modulesList = this.modulesType.map(val => {
+					return val.value
+				})
+				
+				uni.showActionSheet({
+					itemList: modulesList,
+					success : res => {
+						let content
+						switch(this.modulesType[res.tapIndex].id){
+							case 1:
+								content = {
+									content: ''
+								}
+								break
+							case 2:
+								content = {
+									image: [{
+										showpath: '',
+										path	: '',
+										title	: ''
+									}]
+								}
+							break
+							case 3:
+								content = {
+									video_image: {
+										showpath: '',
+										path	: ''
+									},
+									video_url  : {
+										showpath: '',
+										path	: ''
+									}
+								}
+							break
+						}
+						
+						this.modules.push({
+							type	: this.modulesType[res.tapIndex].id,
+							title	: '',
+							content : content
+						})
+					}
+				})
+			},
+			
+			// 删除展示模块
+			removeModule(index){
+				this.modules.splice(index, 1)
+			},
+			
+			// 保存基础信息
+			onNavigationBarButtonTap(e){
+				basicsInfo('PUT', {
+					cover		: this.logo,
+					description	: this.description,
+					address		: this.address,
+					extends		: this.modules
+				}).then(res => {
+					uni.showModal({
+						title		: '提示',
+						content		: '基本信息已保存',
+						showCancel	: false,
+						success		: modalRes=> {
+							if(modalRes.confirm){
+								this.$Router.back()
+							}
+						}
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	// 基础信息
+	.info{
+		background: white;
+		padding: 0 $padding;
+		.item{
+			position: relative;
+			padding: $padding 0 $padding 200rpx;
+			&::after{
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				right: -$padding;
+				content: " ";
+				height: 1rpx;
+				background: #eee;
+			}
+			&:last-child::after{
+				display: none;
+			}
+		}
+		.info-logo{
+			text-align: right;
+			padding-right: 40rpx;
+			label{
+				position: absolute;
+				left: 0;
+				height: 88rpx;
+				line-height: 88rpx;
+			}
+			image{
+				width: 88rpx;
+				height: 88rpx;
+				border-radius: 50%;
+				vertical-align: top;
+				background: $border-color-lg;
+			}
+			.icon{
+				position: absolute;
+				right: 0;
+				top: 50%;
+				margin-top: -10px;
+			}
+		}
+		.info-text{
+			label{
+				position: absolute;
+				left: 0;
+				height: 40rpx;
+				line-height: 40rpx;
+			}
+			textarea{
+				line-height: 40rpx;
+				width: 100%;
+				height: 160rpx;
+			}
+			input{
+				height: 40rpx;
+				width: 100%;
+			}
+		}
+	}
+	// 模块
+	.add-modules{
+		line-height: 90rpx;
+		text-align: center;
+		color: $text-price;
+		background: white;
+		margin-top: $margin;
+		.icon{
+			vertical-align: middle;
+			margin-right: $margin/3;
+		}
+	}
+	// 展示模块
+	.module-item{
+		background: white;
+		padding: $padding/2 $padding;
+		margin-top: $margin;
+		.module-title{
+			display: flex;
+			justify-content: space-between;
+			padding-bottom: $padding/2;
+			border-bottom: solid 1rpx $border-color;
+			.title-input{
+				width: calc(100% - 150rpx);
+				height: 70rpx;
+				font-size: $title-size;
+			}
+			.remove-btn{
+				line-height: 70rpx;
+				color: $text-price;
+				text-align: right;
+				font-size: $title-size-m;
+			}
+		}
+		.module-textarea{
+			padding: $padding 0 $padding/2;
+			width: 100%;
+			font-size: $title-size;
+			line-height: 50rpx;
+			height: 200rpx;
+		}
+		.module-imgs{
+			display: flex;
+			flex-wrap: wrap;
+			padding-top: $padding/2;
+			margin-left: -10rpx;
+			margin-right: -10rpx;
+			.item{
+				position: relative;
+				background: #F8F8F8;
+				width: calc(25% - 20rpx);
+				padding-top: calc(25% - 20rpx);
+				margin: 10rpx;
+				.cover{
+					position: absolute;
+					width: 100%;
+					height: 100%;
+					top: 0;
+					left: 0;
+				}
+				.item-input{
+					position: absolute;
+					bottom: 0;
+					left: 0;
+					right: 0;
+					background: rgba($color: #000000, $alpha: .7);
+					input{
+						height: 50rpx;
+						line-height: 50rpx;
+						font-size: 28rpx;
+						text-align: center;
+						z-index: 4;
+						color: white;
+					}
+				}
+				.item-upd{
+					@extend .vertical;
+					text-align: center;
+					font-size: $title-size-m;
+					color: $text-gray-m;
+				}
+			}
+		}
+		.module-hint{
+			color: $text-gray;
+			font-size: $title-size-sm;
+			padding: $padding/2 0;
+			line-height: 50rpx;
+		}
+		.module-videos{
+			display: flex;
+			padding: $padding 0 ($padding/2);
+			margin-left: -10rpx;
+			margin-right: -10rpx;
+			.item{
+				position: relative;
+				width: calc(50% - #{$margin/2});
+				padding-top: calc(35% - #{$margin/2});
+				background: #f8f8f8;
+				margin: 0 10rpx;
+				.item-upd{
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 100%;
+					text-align: center;
+					font-size: $title-size-m;
+					color: $text-gray-m;
+					line-height: 40rpx;
+					@extend .vertical;
+				}
+				.cover{
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/instrument/customer.vue b/pages/instrument/customer.vue
new file mode 100644
index 0000000..06c0359
--- /dev/null
+++ b/pages/instrument/customer.vue
@@ -0,0 +1,364 @@
+<template>
+	<view class="content">
+		<!-- tabs -->
+		<view class="tabs">
+			<view class="item" :class="{'show': tabsIndex == 'day'}" @click="onTbas('day')">日成交</view>
+			<view class="item" :class="{'show': tabsIndex == 'month'}" @click="onTbas('month')">月成交</view>
+			<view class="item" :class="{'show': tabsIndex == 'year'}" @click="onTbas('year')">年成交</view>
+		</view>
+		<!-- 统计信息 -->
+		<view class="statistics">
+			<view class="statistics-flex">
+				<picker mode="date" :fields="tabsIndex" :value="dateValue" :end="endDate" @change="pickerDate">
+					<view class="statistics-date">
+						{{dateValue}}<uni-icons class="arrowdown" type="arrowdown" color="#555"></uni-icons>
+					</view>
+				</picker>
+				<view class="statistics-lay" :class="{ 'show' : sort != '' || payType != '' || channel != ''}" @click="onScreening">
+					筛选 <uni-icons class="arrowdown" type="settings" color="gray"></uni-icons>
+				</view>
+			</view>
+			<view class="statistics-text">
+				<text>成交产品数量 {{visitor.goods_count}} 人</text>
+				<text>成交产品金额 {{visitor.total}} 元</text>
+			</view>
+		</view>
+		<!-- 数据列表 -->
+		<view class="lists">
+			<block v-if="orders.length > 0">
+				<view class="item" v-for="(item, index) in orders" :key="index">
+					<image class="cover" :src="item.user.avatar" mode="aspectFill"></image>
+					<view class="title nowrap">
+						{{item.user.nickname}}
+						<view class="type">{{item.amount}}</view>
+					</view>
+					<view class="sub-title nowrap">订单号码: {{item.order_no}}</view>
+					<view class="sub-title nowrap">订单时间: {{item.created_at}}</view>
+					<view class="sub-tabs">
+						<text>{{item.driver}}</text>
+						<text>{{item.channel}}</text>
+					</view>
+				</view>
+				<!-- 分页 -->
+				<uni-load-more :status="pageStatus" :iconSize="16"></uni-load-more>
+			</block>
+			<block v-else>
+				<view class="list-null">
+					<image class="icon" src="@/static/icons/listnull-icon.png" mode="widthFix"></image>
+					<view class="sub-title">暂无相关成交客户记录</view>
+				</view>
+			</block>
+		</view>
+		<!-- 列表筛选 -->
+		<uni-popup ref="settingsPopup" background-color="#FFFFFF" @maskClick="onReset">
+			<view class="popup-content">
+				<view class="title">排序方式</view>
+				<view class="popup-choose-flex">
+					<view class="item" :class="{'show' : sort == 'money_asc'}" @click="sort = 'money_asc'">金额从低到高</view>
+					<view class="item" :class="{'show' : sort == 'money_desc'}" @click="sort = 'money_desc'">金额从高到低</view>
+					<view class="item" :class="{'show' : sort == 'sold_asc'}" @click="sort = 'sold_asc'">销量从低到高</view>
+					<view class="item" :class="{'show' : sort == 'sold_desc'}" @click="sort = 'sold_desc'">销量从高到低</view>
+				</view>
+				<view class="title">支付方式</view>
+				<view class="popup-choose-flex">
+					<view class="item" :class="{'show' : payType == 'eb'}" @click="payType = 'eb'">易币交易</view>
+					<view class="item" :class="{'show' : payType == 'money'}" @click="payType = 'money'">现金交易</view>
+				</view>
+				<view class="title">成交渠道</view>
+				<view class="popup-choose-flex">
+					<view class="item" :class="{'show' : channel == 'app'}" @click="channel = 'app'">APP</view>
+					<view class="item" :class="{'show' : channel == 'mini'}" @click="channel = 'mini'">自媒体</view>
+				</view>
+				<view class="popup-btns">
+					<view class="item" @click="onReset">重置</view>
+					<view class="item" @click="onSettings">确定</view>
+				</view>
+			</view>
+			<view class="ios-bottom"></view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import getDate from '@/public/date'
+	import { orderUsers } from '@/apis/interfaces/store'
+	export default {
+		data() {
+			return {
+				tabsIndex	: 'day',
+				dateValue	: '',
+				endDate	 	: '',
+				visitor	 	: {
+					day: 0,
+					all: 0
+				},
+				orders		: [],
+				sort		: '',
+				payType		: '',
+				channel		: '',
+				// 分页
+				pageStatus	: '',
+				page		: 1
+			};
+		},
+		created() {
+			getDate().then(res => {
+				this.dateValue = res
+				this.endDate   = res
+				this.getLists()
+			})
+		},
+		methods:{
+			// tabs筛选
+			onTbas(type){
+				getDate(type).then(res => {
+					this.tabsIndex = type
+					this.dateValue = res
+					this.page      = 1
+					this.getLists()
+				})
+			},
+			onReset(){
+				this.sort	 = ''
+				this.payType = ''
+				this.channel = ''
+			},
+			onSettings(){
+				this.getLists()
+				this.$refs.settingsPopup.close()
+			},
+			// 日期筛选
+			pickerDate(e){
+				let dateValue = e.detail.value
+				this.dateValue = dateValue
+				this.getLists()
+			},
+			// 列表筛选
+			onScreening(){
+				this.$refs.settingsPopup.open('bottom')
+			},
+			// 获取列表
+			getLists(){
+				orderUsers({
+					type	 : this.tabsIndex,
+					date	 : this.dateValue,
+					sort	 : this.sort,
+					pay_type : this.payType,
+					channel	 : this.channel,
+					page	 : this.page
+				}).then(res => {
+					if(res.orders.page.current === 1){
+						this.orders = []
+					}
+					this.visitor 	= res.visitor
+					this.orders  	= this.orders.concat(res.orders.data)
+					this.page   	= res.orders.page.current
+					this.pageStatus	= res.orders.page.has_more ? 'more': 'noMore'
+				}).catch(err => {
+					uni.showToast({
+						title: err,
+						icon : 'none'
+					})
+				})
+			}
+		},
+		onReachBottom() {
+			if(this.pageStatus == 'more'){
+				this.pageStatus = 'loading'
+				this.page += 1
+				this.getLists()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	// 筛选层
+	.popup-content{
+		padding: $padding * 2;
+		.title{
+			font-weight: bold;
+			font-size: $title-size;
+			color: $text-color;
+			margin-top: $margin;
+		}
+		.popup-choose-flex{
+			padding: $padding /2 0;
+			margin: 0 -($margin - 20rpx);
+			display: flex;
+			flex-wrap: wrap;
+			.item{
+				width: calc(33.33% - #{$margin - 10});
+				font-size: $title-size-sm;
+				text-align: center;
+				background: $border-color-lg;
+				line-height: 68rpx;
+				margin: $margin - 20;
+				color: $text-gray;
+				border:solid 1rpx $border-color-lg;
+				box-sizing: border-box;
+				&.show{
+					border:solid 1rpx $text-price;
+					color: $text-price;
+				}
+			}
+		}
+		.popup-btns{
+			padding-top: $padding*2;
+			display: flex;
+			justify-content: space-between;
+			margin: 0 -$margin/2;
+			.item{
+				margin: $margin/2;
+				color: $text-price;
+				background: rgba($color: $text-price, $alpha: .1);
+				width: calc(50% - #{$margin});
+				height: 80rpx;
+				line-height: 80rpx;
+				text-align: center;
+				&:last-child{
+					background-color: $text-price;
+					color: white;
+				}
+			}
+		}
+	}
+	// 空提示
+	.list-null{
+		width: 100vw;
+		height: 40vh;
+		background: white;
+		text-align: center;
+		@extend .vertical;
+		.sub-title{
+			color: $text-gray;
+			font-size: $title-size-m;
+		}
+		.icon{
+			width: 288rpx;
+		}
+	}
+	// content
+	.content{
+		padding-top: 80rpx;
+	}
+	// tabs
+	.tabs{
+		position: fixed;
+		z-index: 99;
+		top: 0;
+		left: 0;
+		width: 100%;
+		display: flex;
+		background: white;
+		justify-content: space-around;
+		line-height: 80rpx;
+		font-size: $title-size-m;
+		color: $text-gray;
+		.item.show{
+			color: $text-price;
+			font-weight: bold;
+		}
+	}
+	// 统计信息
+	.statistics{
+		margin-top: $margin;
+		background-color: white;
+		border-bottom: solid 1rpx $border-color;
+		padding: $padding;
+		.statistics-flex{
+			display: flex;
+			justify-content: space-between;
+			.statistics-date{
+				font-size: $title-size + 4;
+				font-weight: bold;
+				line-height: 60rpx;
+				.arrowdown{
+					margin-left: $margin/2;
+				}
+			}
+			.statistics-lay{
+				font-size: $title-size-sm;;
+				color: gray;
+				line-height: 50rpx;
+				&.show{
+					color: $text-price;
+				}
+				.arrowdown{
+					margin-left: $margin/2;
+				}
+			}
+		}
+		
+		.statistics-text{
+			font-size: $title-size-sm;
+			color: gray;
+			line-height: 50rpx;
+			text{
+				margin-left: $margin;
+				&:first-child{
+					margin: 0;
+				}
+			}
+		}
+	}
+	// 客户列表
+	.lists{
+		padding: $padding/2 0;
+		background: white;
+		.item{
+			padding: ($padding - 10) $padding ($padding - 10) ($padding*2 + 68);
+			position: relative;
+			min-height: 68rpx;
+			&::after{
+				position: absolute;
+				left: $padding*2 + 68;
+				top: 0;
+				right: 0;
+				content: ' ';
+				border-bottom: solid 1rpx $border-color;
+			}
+			&:first-child::after{
+				display: none;
+			}
+			.cover{
+				position: absolute;
+				left: $padding;
+				top: $padding - 10;
+				width: 68rpx;
+				height: 68rpx;
+				border-radius: 50%;
+				background-color: #eee;
+			}
+			.title{
+				padding-right: 200rpx;
+				position: relative;
+				line-height: 58rpx;
+				font-size: $title-size-lg;
+				.type{
+					position: absolute;
+					right: 0;
+					top: 0;
+					width: 180rpx;
+					text-align: right;
+					color: $text-price;
+				}
+			}
+			.sub-title{
+				line-height: 40rpx;
+				font-size: $title-size-sm;
+				color: $text-gray;
+			}
+			.sub-tabs{
+				padding-top: $padding/2;
+				font-size: $title-size-sm;
+				text{
+					margin-right: $margin - 10;
+					background: $border-color-lg;
+					color: $text-gray;
+					padding: 0 ($padding/2);
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
new file mode 100644
index 0000000..4bee423
--- /dev/null
+++ b/pages/login/login.vue
@@ -0,0 +1,204 @@
+
+<template>
+	<view class="content">
+		<view class="title">易品新境</view>
+		<view class="inputs phone">
+			<label class="label">+86</label>
+			<input type="number" placeholder="输入您的手机号码" v-model="phone"/>
+		</view>
+		<view class="inputs sms">
+			<input type="number" placeholder="输入短信验证码" v-model="code"/>
+			<button
+				class="sms-btn"
+				type="default"
+				size="mini"
+				:disabled="phone == '' || getSms"
+				@click="getPhoneCode"
+			>{{getSms ? '重新发送' + smsTime + 's': '发送验证码'}}</button>
+		</view>
+		<button class="btn" type="default" :disabled="phone == '' || code == ''" @click="login">登录</button>
+		<!-- 快捷登录 -->
+		<view class="quick">
+			<view class="quick-title">快捷登录</view>
+			<view class="quick-box">
+				<image class="quick-icon" src="@/static/icons/wechat.png" mode="widthFix"></image>
+			</view>
+		</view>
+		<!-- 用户登录注册协议 -->
+		<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<navigator url="">用户隐私规格</navigator>和<navigator url="">用户服务协议</navigator></view>
+	</view>
+</template>
+
+<script>
+	import { getSms, smsAuth } from '@/apis/interfaces/auth'
+	export default {
+		data() {
+			return {
+				phone	: "18245180131",
+				code	: "",
+				smsTime : 60,
+				getSms	: false
+			}
+		},
+		methods: {
+			// 用户登录
+			login(){
+				smsAuth({
+					mobileNo: this.phone,
+					code	: this.code
+				}).then(res => {
+					this.$store.commit('setToken', res.token_type + ' ' + res.access_token)
+					if(!res.is_company){
+						this.$Router.replace({name: "Registered"})
+						return
+					}
+					this.$Router.back()
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : "none"
+					})
+				})
+			},
+			// 获取验证码
+			getPhoneCode(){
+				let outTime
+				getSms({
+					mobileNo: this.phone
+				}).then(res => {
+					uni.showToast({
+						title: res,
+						icon : "none"
+					})
+					this.getSms = true
+					outTime = setInterval(()=>{
+						if(this.smsTime <= 1){
+							this.getSms  = false
+							this.smsTime = 60
+							clearInterval('outTime')
+						}
+						this.smsTime -= 1
+					},1000)
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : "none"
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		height: 100vh;
+		width: 100vw;
+		padding: $padding * 3;
+		box-sizing: border-box;
+		background: white;
+		.inputs{
+			background: $border-color-lg;
+			border: solid 1rpx $border-color;
+			position: relative;
+			margin-top: $margin;
+			height: 80rpx;
+			line-height: 80rpx;
+			input{
+				width: 100%;
+				height: 80rpx;
+				line-height: 80rpx;
+				padding: 0 $padding;
+				border: none;
+				box-sizing: border-box;
+				font-size: $title-size-lg;
+			}
+			&.phone{
+				padding-left: 120rpx;
+				.label{
+					position: absolute;
+					left: 0;
+					top: 0;
+					width: 120rpx;
+					text-align: center;
+					border-right: solid 1rpx $border-color;
+					font-size: $title-size-lg;
+				}
+			}
+			&.sms{
+				padding-right: 200rpx;
+				.sms-btn[size='mini']{
+					width: 200rpx;
+					height: 80rpx;
+					line-height: 80rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					padding: 0;
+					margin: 0;
+					border-radius: 0;
+					border-left: solid 1rpx $border-color;
+					color: $text-price;
+					font-size: $title-size-lg;
+					&::after{
+						border: none;
+					}
+					&[disabled]{
+						color: rgba($color: $text-price, $alpha: .6);
+						background: $border-color-lg;
+					}
+				}
+			}
+		}
+		.title{
+			text-align: center;
+			font-size: $title-size + 6;
+			font-weight: bold;
+			color: $text-color;
+			margin-bottom: 100rpx;
+		}
+		.btn{
+			background: $text-price;
+			color: white;
+			border-radius: 0;
+			margin-top: $margin;
+			font-size: $title-size;
+			line-height: 90rpx;
+			height: 90rpx;
+			font-weight: bold;
+			&::after{
+				border: none;
+			}
+			&[disabled]{
+				background: rgba($color: $text-price, $alpha: .6);
+			}
+		}
+		.quick{
+			padding-top: $padding * 3;
+			text-align: center;
+			.quick-title{
+				text-align: center;
+				color: $text-gray;
+				font-size: $title-size-sm;
+				padding-bottom: $padding;
+			}
+			.quick-box{
+				display: flex;
+				justify-content: center;
+				.quick-icon{
+					width: 78rpx;
+				}
+			}
+		}
+		.agreement{
+			padding-top: $padding * 4;
+			font-size: $title-size-sm;
+			color: $text-gray;
+			navigator{
+				color: $text-price;
+				display: inline-block;
+				padding: 0 10rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/setting/aboutUs.vue b/pages/setting/aboutUs.vue
new file mode 100644
index 0000000..d4b4769
--- /dev/null
+++ b/pages/setting/aboutUs.vue
@@ -0,0 +1,45 @@
+<template>
+  <view class="AboutUs">
+    <u-parse :html="content"></u-parse>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+  import {
+    aboutUs
+  } from '@/apis/interfaces/setting'
+  export default {
+    data() {
+      return {
+        content: ''
+      };
+    },
+
+    onLoad(e) {
+      this.getInfo()
+    },
+    methods: {
+      getInfo() {
+        aboutUs().then(res => {
+          this.content = res.content
+        }).catch(err => {
+          this.$refs.uToast.show({
+            title: err.message,
+            type: 'primary',
+            duration: 3000
+          })
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+    .AboutUs{
+      padding: 30rpx;
+	  width: 100%;
+	  min-height: 100vh;
+	  background-color: #fff;
+    }
+</style>
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
new file mode 100644
index 0000000..d8f6407
--- /dev/null
+++ b/pages/setting/setting.vue
@@ -0,0 +1,398 @@
+<template>
+	<view class="Setting">
+		<!-- 更多管理 -->
+		<view class="list">
+			<!-- 修改头像 -->
+			<view class="list-item" @click="updImgs">
+				<view class="list-item-left">
+					<image src="/static/imgs/user-avatar.png" mode="widthFix" />
+					<span>修改头像</span>
+				</view>
+				<view class="avatar">
+					<image :src="avatar.showPath" mode="aspectFill" />
+					<u-icon name="arrow-right" color="#f1f1f1" size="28" />
+				</view>
+			</view>
+			<!-- 修改昵称 -->
+			<view class="list-item">
+				<view class="list-item-left">
+					<image src="/static/imgs/mine-self-name.png" mode="widthFix" />
+					<span>修改昵称</span>
+				</view>
+				<view class="input">
+					<input type="text" :value="nickname" @blur='blur' placeholder="请输入用户的昵称" maxlength="12" />
+					<u-icon name="arrow-right" color="#f1f1f1" size="28" />
+				</view>
+			</view>
+			<!-- 绑定微信 -->
+			<button class="list-item" @click="getUser" v-if="false">
+				<view class="list-item-left">
+					<image src="/static/imgs/link-wechat.png" mode="widthFix" />
+					<span>绑定微信</span>
+				</view>
+				<u-icon name="arrow-right" color="#f1f1f1" size="28" />
+			</button>
+			<!-- 个人认证 -->
+			<view @click="loginOut" class="list-item">
+				<view class="list-item-left">
+					<image src="/static/imgs/self-icon.png" mode="widthFix" />
+					<span>个人认证</span>
+				</view>
+				<u-icon name="arrow-right" color="#f1f1f1" size="28" />
+			</view>
+			<!-- 企业认证 -->
+			<view @click="loginOut" class="list-item">
+				<view class="list-item-left">
+					<image src="/static/imgs/company-icon.png" mode="widthFix" />
+					<span>企业认证</span>
+				</view>
+				<u-icon name="arrow-right" color="#f1f1f1" size="28" />
+			</view>
+			<!-- 关于我们 -->
+			<view @click="$router.push({name:'aboutUs'})" class="list-item">
+				<view class="list-item-left">
+					<image src="/static/imgs/mine-about.png" mode="widthFix" />
+					<span>关于我们</span>
+				</view>
+				<u-icon name="arrow-right" color="#f1f1f1" size="28" />
+			</view>
+			<!-- 切换账号 -->
+			<view @click="loginOut" class="list-item">
+				<view class="list-item-left">
+					<image src="/static/imgs/reset-info.png" mode="widthFix" />
+					<span>切换账户</span>
+				</view>
+				<u-icon name="arrow-right" color="#f1f1f1" size="28" />
+			</view>
+		</view>
+
+		<view class="edition">
+			链商星球 beta 1.0.0
+		</view>
+		<!-- 底部版本 -->
+
+		<u-toast ref="uToast" />
+
+	</view>
+</template>
+
+<script>
+	import {
+		wechatbind,
+		resetUserInfo,
+		getUserSettingInfo
+	} from '@/apis/interfaces/setting'
+	import {
+		uploads
+	} from '@/apis/interfaces/uploading'
+	export default {
+		name: 'Setting',
+		data() {
+			return {
+				canLogin: true,
+				nickname: '',
+				avatar: {
+					path: '',
+					showPath: ''
+				},
+				is_bind: true
+			}
+		},
+		onShow() {
+			wx.login({
+				success: res => {
+					this.loginCode = res.code
+				}
+			})
+			this.getUserInfo()
+		},
+		onPullDownRefresh() {
+			this.getUserInfo()
+		},
+		methods: {
+			// 获取当前用户得基本信息
+			getUserInfo() {
+				getUserSettingInfo().then(res => {
+					this.avatar.showPath = res.avatar
+					this.nickname = res.nickname
+					this.is_bind = res.is_bind
+					uni.stopPullDownRefresh()
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'primary',
+						duration: 3000
+					})
+				})
+			},
+			// 点击绑定用户得授权信息，且绑定带修改
+			getUser() {
+				uni.getUserProfile({
+					desc: "获取你的昵称、头像、地区及性别",
+					success: e => {
+						if (e.errMsg == "getUserProfile:ok") {
+							this.userInfo = e.userInfo
+							//   // 检查用户登录Code是否过期
+							wx.checkSession({
+								success: res => {
+									this.userLogin(e)
+								},
+								fail: err => {
+									// 登录过期重新获取code
+									uni.login({
+										success: res => {
+											this.loginCode = res.code
+											// 登录
+											this.userLogin()
+										}
+									})
+								}
+							})
+						} else {
+							uni.showToast({
+								duration: 1500,
+								title: "绑定手机号失败了",
+								icon: 'none'
+							})
+						}
+					},
+					fail() {
+						uni.showToast({
+							duration: 1500,
+							title: "您拒绝了请求",
+							icon: 'none'
+						})
+					}
+				})
+			},
+			// 登陆接口
+			userLogin(info) {
+				let that = this
+				uni.login({
+					success: res => {
+						let data = {
+							iv: info.iv,
+							encryptedData: info.encryptedData,
+							code: res.code
+						}
+						uni.showLoading({
+							title: '绑定中'
+						})
+						wechatbind(data).then(res => {
+							setTimeout(res => {
+								uni.hideLoading()
+							}, 1000)
+							this.$refs.uToast.show({
+								title: '绑定成功',
+								type: 'primary',
+								duration: 3000
+							})
+							setTimeout(res => {
+								this.getUserInfo()
+							}, 3000)
+						}).catch(err => {
+							this.$refs.uToast.show({
+								title: err.message,
+								type: 'primary',
+								duration: 3000
+							})
+							uni.hideLoading()
+						})
+					}
+				});
+
+			},
+			loginOut() {
+				uni.removeStorageSync('token')
+				uni.reLaunch({
+					url: '/pages/login/login'
+				})
+			},
+			// 上传头像
+			updImgs(type) {
+				uni.chooseImage({
+					success: res => {
+						let path = res.tempFiles.map((val, index) => {
+							return {
+								name: 'uploads' + index,
+								uri: val.path
+							}
+						})
+						uploads(path).then(pathRes => {
+							this.avatar.path = pathRes.path[0]
+							this.avatar.showPath = pathRes.url[0]
+							this.resetUserInfo('avatar', pathRes.url[0])
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon: 'none'
+							})
+						})
+					}
+				})
+			},
+			// 修改姓名
+			blur(e) {
+				let value = e.detail.value
+				if (value !== this.nickname) {
+					this.resetUserInfo('nickname', value)
+				}
+			},
+			// 修改头像或昵称
+			resetUserInfo(key, value) {
+				let data = {
+					key: key,
+					value: value
+				}
+				resetUserInfo(data).then(res => {
+					console.log(res, 'res...')
+					uni.showToast({
+						title: res,
+						icon: 'none'
+					})
+					setTimeout(res => {
+						this.getUserInfo()
+					}, 2000)
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.Setting {
+		width: 100vw;
+		min-height: 100vh;
+		position: relative;
+		background-color: #fff;
+
+		// 版本
+		.edition {
+			color: #cacaca;
+			text-align: center;
+			padding: 20rpx 30rpx;
+		}
+
+		// 更多管理
+		.list {
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+			justify-content: flex-start;
+			box-sizing: border-box;
+			position: relative;
+			top: -10rpx;
+			border-radius: 20rpx;
+			margin: 0 40rpx;
+			padding: 30rpx 0;
+			width: calc(100% - 80rpx);
+
+			button::after {
+				border: none;
+				background-color: none;
+			}
+
+			button {
+				position: relative;
+				display: block;
+				margin-left: auto;
+				margin-right: auto;
+				padding-left: 0;
+				padding-right: 0;
+				box-sizing: border-box;
+				font-size: $title-size *0.9;
+				text-align: center;
+				text-decoration: none;
+				line-height: 1;
+				border-radius: 5px;
+				-webkit-tap-highlight-color: transparent;
+				overflow: hidden;
+				color: #333;
+				background-color: #fff;
+			}
+
+			.list-item {
+				width: 100%;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				padding: 40rpx 0;
+				border-bottom: solid 1rpx #f7f7f7;
+				box-sizing: border-box;
+
+				.avatar {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+					box-sizing: border-box;
+
+					image {
+						width: 100rpx;
+						height: 100rpx;
+						border-radius: 50%;
+						margin-right: 20rpx;
+					}
+				}
+
+				.input {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+					box-sizing: border-box;
+					text-align: right;
+					flex: 1;
+
+					input {
+						padding-right: 30rpx;
+						width: 100%;
+					}
+				}
+
+				.list-item-left {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: flex-start;
+					box-sizing: border-box;
+
+					image {
+						width: 44rpx;
+						height: 44rpx;
+					}
+
+					span {
+						margin-left: 30rpx;
+					}
+				}
+			}
+		}
+
+		// 底部轮播图跳转到其他app
+		.mine-banner {
+			position: relative;
+			width: calc(100% - 80rpx);
+			top: -20rpx;
+			margin: 0 40rpx;
+			box-sizing: border-box;
+			margin-top: $margin*2;
+		}
+	}
+
+	.loginOut {
+		margin: 30rpx 50rpx;
+		background-color: #fff;
+		box-shadow: 0 0 20rpx 4rpx rgba($color: $mian-color, $alpha: 0.1);
+		text-align: center;
+		padding: 20rpx;
+		border-radius: 10rpx;
+		color: #353535;
+	}
+</style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index cb90488..118f6c4 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,6 +1,14 @@
 <template>
 	<view>
-		节点中心
+		<view class="btns">
+			<view class="item" @click="$Router.push({name: 'instrumentBasics'})">基础信息</view>
+			<view class="item" @click="$Router.push({name: 'goodsManagement'})">商品权证</view>
+			<view class="item" @click="$Router.push({name: 'instrumentBasics'})">优惠券管理</view>
+			<view class="item" @click="$Router.push({name: 'instrumentBasics'})">店员管理</view>
+			<view class="item" @click="$Router.push({name: 'instrumentCustomer'})">成交客户</view>
+			<view class="item" @click="$Router.push({name: 'instrumentBasics'})">店员管理</view>
+			<view class="item" @click="$Router.push({name: 'setting'})">设置中心</view>
+		</view>
 	</view>
 </template>
 
@@ -15,5 +23,15 @@
 </script>
 
 <style lang="scss">
-
+	.btns{
+		padding: 30rpx 0;
+		.item{
+			background: white;
+			margin: $margin;
+			border-radius: $radius/2;
+			line-height: 90rpx;
+			text-align: center;
+			font-weight: bold;
+		}
+	}
 </style>
diff --git a/pages/verification/history.vue b/pages/verification/history.vue
new file mode 100644
index 0000000..6bb1dc4
--- /dev/null
+++ b/pages/verification/history.vue
@@ -0,0 +1,517 @@
+<template>
+	<view class="Record" v-if="loaded">
+		<view class="record-top">
+			<image src="/static/images/ver-bg.png" mode="widthFix" class="record-bg" />
+			<view class="record-top-nav">
+				<view :class="['record-top-item',type==='year'?'selectTopItem':'']" @click="selectType('year')">按年
+				</view>
+				<view :class="['record-top-item',type==='month'?'selectTopItem':'']" @click="selectType('month')">按月
+				</view>
+				<view :class="['record-top-item',type==='day'?'selectTopItem':'']" @click="selectType('day')">按日</view>
+			</view>
+			<view class="record-mouth-year">
+				<view class="record-type-left">
+					<u-picker mode="time" v-model="show" :params="params" @confirm='confirm' title='筛选日期'
+						start-year='2021' :end-year='currentYear' />
+					<view @click="show = true">
+						{{date?date:'选择日期'}}
+						<uni-icons type="arrowdown" color="#fff" size="12" />
+					</view>
+				</view>
+				<view class="record-type-right">
+					<view :class="['pay_type_item',scantype==='goods'?'pay_type_item_select':'']"
+						@click="selectCoinType('goods')">权证</view>
+					<view :class="['pay_type_item',scantype==='coupons'?'pay_type_item_select':'']"
+						@click="selectCoinType('coupons')">优惠券</view>
+				</view>
+			</view>
+			<view class="record-title">核销总数 ( 件 ) </view>
+			<view class="record-money"><span></span>{{account}}
+				<span></span>
+			</view>
+		</view>
+
+		<view class="boss" v-if="isBos">
+			<view class="boss-left">
+				<image src="/static/images/boss.png" mode="mode" class="boss-img">我是BOSS
+			</view>
+			<view class="boss-right" @click="shopShow = true">
+				<u-select v-model="shopShow" :list="ShopList" @confirm="shopConfirm" value-name='store_id'
+					label-name='name' />
+				门店：<u-icon name="arrow-down" color="#606266" label-color='#606266' margin-right='10' label-pos='left'
+					:label='store_id?store_name:"全部门店"' size="28" />
+			</view>
+		</view>
+
+		<!-- 列表。。。 -->
+		<view class="lists" v-if="lists.length>0">
+			<view class="list-item" v-for="(item,index) in lists" :key='index'>
+
+				<view class="list-item-title">
+					<view class="left">
+						<view class="tags">{{scantype === 'goods'?'权证核销':'优惠券核销'}}</view>
+						<view class='title' v-if="scantype === 'goods'">{{item.goods_sku.goods_name}}</view>
+						<view class='title' v-else>{{item.coupon.title}}</view>
+					</view>
+					<!-- <view class="right"> -->
+					<!-- <u-icon  name="checkmark-circle-fill" size='50' color='#e93340' /> -->
+					<!-- </view> -->
+				</view>
+
+				<view class="list-item-content" v-if='scantype === "goods"'>
+					<image class="good-img" :src="item.goods_sku.cover" mode="aspectFill" />
+					<view class="list-item-right">
+						<view class="content-item">核销商品数量：X {{item.qty}} </view>
+						<view class="content-item">核销商品规格：{{item.goods_sku.unit || '通用规格'}}</view>
+						<view class="content-item">核销时间：{{item.used_at}}</view>
+					</view>
+				</view>
+				<view class="list-item-content" v-else>
+					<image class="good-img" v-if='item.source.type ==="goods"' :src="item.source.cover"
+						mode="aspectFill" />
+					<view class="list-item-right">
+						<view class="content-item" v-if='item.source.type ==="goods"'>兑换商品名称：{{item.source.name}}
+						</view>
+						<view class="content-item"> 优惠券规格：满 {{item.coupon.full}} 减 {{item.coupon.price}} </view>
+						<view class="content-item">优惠券类型：{{item.coupon.type.text}}</view>
+						<view class="content-item">核销时间：{{item.used_at}}</view>
+					</view>
+				</view>
+
+				<view class="person">
+					<image class="avatar" :src="item.clerk.avatar" mode="aspectFill" />
+					{{item.clerk.nickname}}
+					<view class="shop-name">{{item.store.name}}</view>
+				</view>
+
+			</view>
+		</view>
+		<!-- 无列表 -->
+		<no-list v-if="lists.length === 0 && scantype === 'goods'" name='no-in' txt="没有任何权证核销记录" />
+		<no-list v-if="lists.length === 0 && scantype === 'coupons'" name='no-out' txt="没有任何优惠券核销记录" />
+
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		scanList
+	} from '@/apis/interfaces/scan';
+	export default {
+		data() {
+			return {
+				lists: [],
+				has_more: true,
+				page: 1,
+				type: 'year', // 统计类型day日，month月，year年
+				scantype: 'goods', // goods 数权核销  coupons 优惠券核销
+				date: new Date().toISOString().slice(0, 4), // 日：Y-m-d，月Y-m，年Y
+				params: {
+					year: true,
+					month: true,
+					day: true
+				},
+				show: false, // 显示
+				currentDay: new Date().toISOString().slice(0, 10),
+				currentMonth: new Date().toISOString().slice(0, 7),
+				currentYear: new Date().toISOString().slice(0, 4),
+				account: '',
+				loaded: false,
+				shopShow: false,
+				ShopList: [],
+				store_name: '',
+				store_id: '',
+				isBos:false
+			}
+		},
+		onLoad() {
+			this.getList()
+		},
+		onReachBottom() {
+			if (this.has_more) {
+				this.page = this.page + 1
+				this.getList()
+			} else {
+				this.$refs.uToast.show({
+					title: '吼吼吼~我是有底的~',
+					type: 'error',
+					icon: false,
+					duration: 3000
+				})
+			}
+		},
+		methods: {
+			// 获取列表
+			getList() {
+				let data = {
+					page: this.page,
+					date_type: this.type,
+					date: this.date,
+					store_id:this.store_id
+				}
+				let apiUrl = ''
+				if (this.scantype === 'goods') {
+					apiUrl = 'manages/warrants/logs'
+				} else {
+					apiUrl = 'coupons/verify/logs/coupons'
+				}
+
+				scanList(apiUrl, data).then(res => {
+					console.log(res)
+					this.account = res.all
+					this.lists = this.lists.concat(res.lists.data)
+					this.has_more = res.lists.page.has_more
+					this.loaded = true
+					this.ShopList = [{name:'全部',store_id:''},...res.stores]
+					this.isBos = res.isBos
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon: false,
+						duration: 3000
+					})
+				})
+			},
+			selectCoinType(type) {
+				if (this.scantype !== type) {
+					this.scantype = type
+					this.store_id = ''
+					this.reset()
+				}
+			},
+			// 重置
+			reset() {
+				this.page = 1
+				this.lists = []
+				this.has_more = true
+				this.getList()
+			},
+			// 选择 年  月  日 切换要重置数据
+			selectType(type) {
+				console.log(type, typeof type)
+				if (this.type !== type) {
+					switch (type) {
+						case 'year':
+							this.type = type
+							this.params = {
+								year: true,
+								month: false,
+								day: false
+							}
+							this.date = this.currentYear
+							this.store_id = ''
+							this.reset()
+							break;
+						case 'month':
+							this.type = type
+							this.params = {
+								year: true,
+								month: true,
+								day: false
+							}
+							this.date = this.currentMonth
+							this.store_id = ''
+							this.reset()
+							break;
+						case 'day':
+							this.type = type
+							this.params = {
+								year: true,
+								month: false,
+								day: false
+							}
+							this.date = this.currentDay
+							this.store_id = ''
+							this.reset()
+							break;
+					}
+				}
+			},
+			// 点击确认按钮年月日
+			confirm(e) {
+				let type = this.type
+				switch (type) {
+					case 'year':
+						this.date = e.year
+						this.reset()
+						break;
+					case 'month':
+						this.date = e.year + '-' + e.month
+						this.reset()
+						break;
+					case 'day':
+						this.date = e.year + '-' + e.month + '-' + e.day
+						this.reset()
+						break;
+				}
+			},
+			// 筛选门店信息
+			shopConfirm(e) {
+				this.store_id = e[0].value
+				this.store_name = e[0].label
+				this.reset()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.Record {
+		width: 100%;
+		min-height: 100vh;
+		padding-top: 30rpx;
+		background-color: #f5f5f5;
+	}
+
+	.record-top {
+		width: calc(100% - 60rpx);
+		height: 360rpx;
+		background-image: linear-gradient(to left, #076cff, #076cff);
+		box-shadow: 0 10rpx 20rpx 0rpx rgba($color: $main-color, $alpha: 0.4);
+		margin: 0 30rpx;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		position: relative;
+		padding: 10rpx 50rpx 20rpx 50rpx;
+		z-index: 1;
+
+		.record-bg {
+			position: absolute;
+			width: 230rpx;
+			bottom: 0;
+			right: 30rpx;
+			z-index: 1;
+		}
+
+		.record-top-nav {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+
+			.record-top-item {
+				margin: 40rpx 20rpx;
+				font-size: 30rpx;
+				font-weight: 500;
+				color: #fff;
+			}
+
+			.selectTopItem {
+				border-bottom: solid 4rpx #fff;
+			}
+		}
+
+		.record-mouth-year {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
+			position: relative;
+			z-index: 2;
+			color: #fff;
+			font-size: 30rpx;
+
+			.record-type-left {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+
+				uni-icons {
+					margin-left: 4rpx;
+				}
+			}
+
+			.record-type-right {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				font-size: 24rpx;
+
+				.pay_type_item {
+					margin: 0 10rpx;
+					padding: 2rpx 20rpx;
+					border-radius: 30rpx;
+					border: solid 1rpx rgba($color: #000000, $alpha: 0);
+				}
+
+				.pay_type_item_select {
+					border: solid 1rpx #f7f7f7;
+				}
+			}
+		}
+
+		.record-title {
+			font-size: 28rpx;
+			color: #fff;
+			padding: 20rpx 0;
+		}
+
+		.record-money {
+			color: #fff;
+			font-size: 50rpx;
+			font-weight: bold;
+
+			span {
+				font-size: 30rpx;
+				font-weight: 400;
+				margin-right: 4rpx;
+			}
+		}
+	}
+
+	.boss {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 30rpx;
+		background-color: #fff;
+
+		.boss-left {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.boss-right {
+			font-size: 28rpx;
+
+			u-icon {
+				padding-left: 20rpx;
+			}
+		}
+
+		.boss-img {
+			width: 90rpx;
+			height: 90rpx;
+			border-radius: 50%;
+			margin-right: 20rpx;
+		}
+	}
+
+	// 列表
+	.lists {
+		// box-shadow: 0 10rpx 20rpx 0rpx rgba($color: #000, $alpha: 0.4);
+		padding: 20rpx;
+
+		.list-item {
+			background-color: #fff;
+			width: 100%;
+			border-radius: 20rpx;
+			margin-bottom: 20rpx;
+			padding: 20rpx;
+
+			.list-item-title {
+				width: 100%;
+				border-bottom: solid 1rpx #f7f7f7;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				padding: 20rpx 0;
+
+				.left {
+					flex: 1;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: flex-start;
+					box-sizing: border-box;
+
+					.title {
+						width: 520rpx;
+						overflow: hidden;
+						font-size: 30rpx;
+						margin-left: 12rpx;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.tags {
+						padding: 4rpx 10rpx;
+						border-radius: 20rpx 0 20rpx 0;
+						background-color: #076cff;
+						font-size: 26rpx;
+						color: #fff;
+					}
+				}
+
+				// .right{
+				// 	padding: 20rpx 30rpx;
+				// }
+			}
+
+
+			.list-item-content {
+				width: 100%;
+				color: #999;
+				padding: 20rpx 0;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				border-bottom: solid 1rpx #f7f7f7;
+
+				.good-img {
+					margin-right: 20rpx;
+					width: 160rpx;
+					height: 160rpx;
+					border-radius: 10rpx;
+				}
+
+				.list-item-right {
+					flex: 1;
+
+					.content-item {
+						padding: 10rpx 0;
+					}
+				}
+			}
+
+			.person {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				padding: 20rpx 0 0 0;
+				font-weight: bold;
+
+				.avatar {
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 50%;
+					margin-right: 10rpx;
+				}
+
+				.shop-name {
+					background-color: #076cff;
+					color: #fff;
+					font-size: 24rpx;
+					font-weight: 400;
+					padding: 4rpx 20rpx;
+					border-radius: 12rpx;
+					margin-left: 20rpx;
+				}
+			}
+
+		}
+	}
+</style>
diff --git a/pages/verification/index.vue b/pages/verification/index.vue
new file mode 100644
index 0000000..1eac1bb
--- /dev/null
+++ b/pages/verification/index.vue
@@ -0,0 +1,409 @@
+<template>
+	<view class="Verification">
+		<image class="top-img" src="/static/images/hexiao_bg.png" mode="widthFix" />
+		<view class="txt">
+			<view class="title">扫描券码和权证 一键核销</view>
+			<view class="des">降低核销门槛 <span class='dian'>·</span>低成本留存优质客户</view>
+		</view>
+		<view class="btn">
+			<view class="goods" @click="scanCode('goods','get')"> 权证核销 </view>
+			<view class="coupons" @click="scanCode('coupons','get')"> 优惠券核销 </view>
+		</view>
+		<view class="history" @click="goHistory">核销记录</view>
+		<u-toast ref="uToast" />
+
+		<!-- 二维码展示动画效果 -->
+		<view class="showCode " v-if="showCode">
+			<view class="showCodeBg" @click="showCode = false"></view>
+			<view :class="['showCodeContent', showCode?'showCodeContentSelect':'showCodeContentSelectNo']">
+				<view class="showCodeTitle"> {{scanType === 'goods'?'确认核销该权证':'确认核销该优惠券'}}</view>
+				<view class="goodsInfo" v-if="scanType === 'goods'">
+					<image class="left" :src="info.goods.cover" mode="widthFix" />
+					<view class="right">
+						<view class="title ellipsis-2">{{info.goods.goods_name}}</view>
+						<view class="number">核销数量: X {{info.qty}}</view>
+					</view>
+				</view>
+				<view class="goodsInfo" v-else>
+					<view class="right">
+						<view class="title ellipsis-2">优惠券名称：‘ {{info.coupon.title}} ’</view>
+						<view class="number">
+							优惠券类型：{{info.coupon.type.text}}
+							<span style='padding-left: 20rpx;'>数量：1</span>
+						</view>
+						<view class="number">备注：{{info.coupon.remark}}</view>
+
+					</view>
+				</view>
+				<view class="sureVer" @click="scanInfo(code,'post',)">确认核销</view>
+				<view class="showCodeDes">请谨慎核销,操作成功后无法撤回</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		scanInfo
+	} from '@/apis/interfaces/scan'
+	export default {
+		data() {
+			return {
+				scanType: 'goods', // coupons 优惠券核销  goods 权证核销
+				showCode: false,
+				info: '', // 权证核销返回前置
+				code: '', // 扫码返回的code
+			};
+		},
+		onLoad() {
+			uni.hideLoading()
+		},
+		methods: {
+			scanCode(e) {
+				console.log(e)
+				this.scanType = e
+				uni.scanCode({
+					success: (res) => {
+						console.log('条码类型：' + res.scanType);
+						console.log('条码内容：' + res.result);
+						// uni.showLoading({
+						// 	title: '核销请求中..'
+						// })
+						this.code = res.result
+						this.scanInfo(res.result, 'get')
+					}
+				});
+			},
+			// 请求核销前置，优惠券前置和权证前置（get） post 是核销
+			scanInfo(token, method) {
+				console.log(token, this.scanType)
+				let apiUrl = ''
+				let data = {
+					code: token
+				}
+				if (this.scanType === 'goods') {
+					console.log('权证核销')
+					apiUrl = 'manages/warrants/verification'
+				} else {
+					console.log('优惠券核销！')
+					apiUrl = 'coupons/verify/coupon'
+				}
+				scanInfo(apiUrl, data, method).then(res => {
+					if (this.scanType === 'goods') {
+						uni.hideLoading()
+						if (method === 'post') {
+							this.showCode = false
+							this.$refs.uToast.show({
+								title: '权证核销成功',
+								type: 'error',
+								icon: false,
+								duration: 3000
+							})
+						} else {
+							this.showCode = true
+							this.info = res
+						}
+					} else {
+						console.log('优惠券核销 有商品跳转优惠券详情页面，没有商品直接弹出核销页面！')
+						console.log(res, 'res')
+						if (method === 'post') {
+							this.showCode = false
+							this.$refs.uToast.show({
+								title: '优惠券核销成功',
+								type: 'error',
+								icon: false,
+								duration: 3000
+							})
+						} else {
+							if (res.goods.length > 0) {
+								uni.showModal({
+									title: '温馨提示',
+									content: '该优惠券下绑定了商品，是否勾选相应商品',
+									success: (res1) => {
+										if (res1.confirm) {
+											uni.navigateTo({
+												url: '/pages/property/coupon/canUseList?code=' +
+													this.code
+											})
+										} else {
+											this.showCode = true
+											this.info = res.info
+										}
+									}
+								})
+							} else {
+								this.showCode = true
+								this.info = res.info
+							}
+						}
+					}
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon: false,
+						duration: 3000
+					})
+					this.showCode = false
+				})
+			},
+			// 核销记录
+			goHistory() {
+				uni.navigateTo({
+					url:'/pages/verification/history'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.Verification {
+		width: 100%;
+		min-height: 100vh;
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+
+		.top-img {
+			margin-top: 100rpx;
+		}
+
+		.txt {
+			padding-top: 120rpx;
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+
+			.title {
+				font-size: 42rpx;
+				font-weight: 500;
+			}
+
+			.des {
+				font-size: 34rpx;
+				color: rgba($color: #255a7c, $alpha: .4);
+				padding-top: 20rpx;
+				font-weight: bold;
+
+				.dian {
+					color: #039bfe;
+					padding: 0 10rpx;
+				}
+			}
+		}
+
+		.btn {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			margin-top: 140rpx;
+
+			.goods,
+			.coupons {
+				width: 310rpx;
+				height: 90rpx;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				box-sizing: border-box;
+				border-radius: 8rpx;
+				border: solid 1rpx #039bfe;
+				color: #039bfe;
+				font-size: 34rpx;
+				font-weight: bold;
+			}
+
+			.coupons {
+				background-color: #039bfe;
+				color: #fff;
+				margin-left: 30rpx;
+			}
+		}
+
+		.history {
+			text-align: center;
+			padding: $padding;
+			width: 100%;
+			color: #cacaca;
+		}
+	}
+
+	// 动画效果
+	.showCode {
+		width: 100%;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		z-index: 1;
+
+		.showCodeBg {
+			background-color: rgba($color:#000, $alpha: 0.3);
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 2;
+		}
+
+		.showCodeContentSelect {
+			animation: sk-foldCubeAngle .6s linear both;
+		}
+
+		.showCodeContentSelectNo {
+			animation: sk-foldCubeAngleNo .6s linear both;
+		}
+
+		.showCodeContent {
+			padding: 50rpx 30rpx 30rpx 30rpx;
+			width: 640rpx;
+			min-height: 500rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			padding: 30rpx;
+			position: relative;
+			z-index: 199;
+
+			image {
+				width: 60%;
+			}
+
+			.showCodeTitle {
+				font-weight: bold;
+				padding-bottom: 20rpx;
+				font-size: 40rpx;
+				margin-bottom: 20rpx;
+				margin-top: 30rpx;
+			}
+
+			.goodsInfo {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				margin: $margin;
+
+				// background-color:red;
+				.left {
+					width: 200rpx;
+					height: 200rpx;
+					margin-right: 20rpx;
+					border-radius: 2rpx;
+				}
+
+				.right {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					align-items: flex-start;
+					justify-content: center;
+					box-sizing: border-box;
+
+					.title {
+						font-size: 30rpx;
+						font-weight: bold;
+					}
+
+					.number {
+						padding-top: 10rpx;
+						color: #999;
+					}
+				}
+			}
+
+			.sureVer {
+				background-color: #039bfe;
+				width: 500rpx;
+				height: 90rpx;
+				border-radius: 8rpx;
+				color: #fff;
+				margin: 30rpx 0;
+				font-size: 40rpx;
+				font-weight: bold;
+				text-align: center;
+				line-height: 90rpx;
+			}
+
+			.showCodeDes {
+				padding: 20rpx 0 20rpx 0;
+				color: gray;
+				font-size: 24rpx;
+			}
+		}
+
+		@keyframes sk-foldCubeAngle {
+			0% {
+				-webkit-transform: perspective(140px) rotateX(-180deg);
+				transform: perspective(140px) rotateX(-180deg);
+				opacity: 0;
+			}
+
+			100% {
+				-webkit-transform: perspective(140px) rotateX(0deg);
+				transform: perspective(140px) rotateX(0deg);
+				opacity: 1;
+			}
+		}
+
+		@keyframes sk-foldCubeAngleNo {
+			0% {
+				transform: scale(1);
+				opacity: 1;
+			}
+
+			25% {
+				transform: scale(0);
+				opacity: 0;
+			}
+		}
+
+		@keyframes turn {
+			0% {
+				-webkit-transform: rotate(0deg);
+				opacity: 1;
+			}
+
+			25% {
+				-webkit-transform: rotate(90deg);
+				opacity: .9;
+			}
+
+			50% {
+				-webkit-transform: rotate(180deg);
+				opacity: .8;
+			}
+
+			75% {
+				-webkit-transform: rotate(270deg);
+				opacity: .9;
+			}
+
+			100% {
+				-webkit-transform: rotate(360deg);
+				opacity: 1;
+			}
+		}
+
+	}
+</style>
diff --git a/public/date.js b/public/date.js
new file mode 100644
index 0000000..abb6103
--- /dev/null
+++ b/public/date.js
@@ -0,0 +1,30 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 日期
+ */
+
+export default getDate = (type) =>{
+	return new Promise((resolve, reject) => {
+		const date  = new Date()
+		const year  = date.getFullYear()
+		const month = (date.getMonth() + 1) <= 9 ? '0' + (date.getMonth() + 1)  : date.getMonth()
+		const day	= date.getDate()
+		
+		switch(type){
+			case 'day':
+				resolve(year + '-' + month + '-' + day)
+				break
+			case 'month':
+				resolve(year + '-' + month)
+				break
+			case 'year':
+				resolve(year)
+				break
+			default:
+				resolve(year + '-' + month + '-' + day)
+		}
+	})
+}
diff --git a/public/userAuth.js b/public/userAuth.js
new file mode 100644
index 0000000..fd9b22b
--- /dev/null
+++ b/public/userAuth.js
@@ -0,0 +1,135 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 登录
+ */
+
+import { router } from '../router'
+import { keyAuth } from '../apis/interfaces/auth'
+import store from '../store'
+
+class userAuth {
+	constructor() {
+		this.univerfyConfig = {
+			fullScreen	: true,
+			authButton: {
+				'title': '一键登录',
+				'normalColor': '#c82626',
+				'highlightColor': '#a61010',
+				'disabledColor': '#d86767',
+				'borderRadius': '0'
+			},
+			otherLoginButton: {
+				'title': '其他手机号码',
+				'borderColor': '#c82626',
+				'borderRadius': '0',
+				'textColor': '#c82626'
+			},
+			privacyTerms: {
+				'checkedImage': '/static/icons/checked-icon.png',
+				'uncheckedImage': '/static/icons/unchecked-icon.png',
+				'textColor': '#555555',
+				'termsColor': '#c82626',
+				'suffix': '并使用本机号码登录/注册',
+				'privacyItems': [{
+					'url': 'https://www.baidu.com',
+					'title': '用户隐私规格'
+				},{
+					'url': 'https://www.baidu.com',
+					'title': '用户服务协议'
+				}]
+			},
+			buttons: {
+				'iconWidth': '45px',
+				'list': [{
+					"provider": '微信登录',
+					"iconPath": '/static/icons/wechat.png',
+				}]
+			}
+		}
+	}
+	// 预登录
+	Login(){
+		return new Promise((resolve, reject) => {
+			uni.showLoading({
+				title: '加载中',
+				mask : true
+			})
+			uni.preLogin({
+				provider: 'univerify',
+				success	: res=> {
+					this.keyLogin().then(() => {
+						resolve({
+							auth: true
+						})
+					}).catch(errMsg => {
+						reject(errMsg)
+					})
+				},
+				fail   	: err=> {
+					router.push({name: 'Login'})
+				},
+				complete() {
+					uni.hideLoading()
+				}
+			})
+		})
+	}
+	// 一键登录
+	keyLogin(){
+		return new Promise((resolve, reject) => {
+			uni.login({
+				provider		: 'univerify',
+				univerifyStyle	: {...this.univerfyConfig},
+				success: authResult => {
+					keyAuth({
+						access_token: authResult.authResult.access_token,
+						openid		: authResult.authResult.openid
+					}).then(res => {
+						uni.closeAuthView()
+						store.commit('setToken', res.token_type + ' ' + res.access_token)
+						resolve()
+						if(!res.is_company){
+							router.push({name: "Registered"})
+							return
+						}
+					}).catch(err => {
+						reject(err)
+					})
+				},
+				fail   : err => {
+					uni.closeAuthView()
+					switch(err.code){
+						case 30002:
+							router.push({name: "Login"})
+							break
+						case 30008:
+							this.wechatAuth()
+							break
+					}
+				}
+			})
+		})
+	}
+	
+	/**
+	 * 微信登录
+	 */
+	wechatAuth(){
+		uni.showToast({
+			title: '微信登录',
+			icon : 'none'
+		})
+	}
+	
+	/**
+	 * 处理登录状态维护
+	 */
+	updAuthToken(){
+		
+	}
+}
+
+export default userAuth
diff --git a/scss/globa.scss b/scss/globa.scss
index 073c20e..2876f60 100644
--- a/scss/globa.scss
+++ b/scss/globa.scss
@@ -9,9 +9,9 @@
 $text-color: #333;
 $text-gray: #555;
 $text-gray-m: #999;
-$text-price: #e93340;
-$main-color: #e93340;
-$main-color-light: #e93340;
+$text-price: #8b64fd;
+$mian-color: #8b64fd;
+$mian-color-deep: #824f9a;
 
 // 边框颜色
 $border-color: #ddd;
@@ -25,6 +25,7 @@ $title-size-sm: 26rpx;
 
 // 模块圆角
 $radius: 20rpx;
+$radius-sm: 10rpx;
 
 // 模块边距
 $margin: 30rpx;
@@ -111,7 +112,6 @@ $padding: 30rpx;
 	-webkit-line-clamp: 5;
 }
 
-
 // 修改nvtab
 $mainColor: white;
 
diff --git a/static/background/chain-back-00.png b/static/background/chain-back-00.png
new file mode 100644
index 0000000..b314449
Binary files /dev/null and b/static/background/chain-back-00.png differ
diff --git a/static/background/chain-back-01.png b/static/background/chain-back-01.png
new file mode 100644
index 0000000..fdd32cf
Binary files /dev/null and b/static/background/chain-back-01.png differ
diff --git a/static/background/chain-back-02.png b/static/background/chain-back-02.png
new file mode 100644
index 0000000..ba604f4
Binary files /dev/null and b/static/background/chain-back-02.png differ
diff --git a/static/background/crystal-background.png b/static/background/crystal-background.png
new file mode 100644
index 0000000..dcbf609
Binary files /dev/null and b/static/background/crystal-background.png differ
diff --git a/static/background/idcard-positive.png b/static/background/idcard-positive.png
new file mode 100644
index 0000000..bb22c71
Binary files /dev/null and b/static/background/idcard-positive.png differ
diff --git a/static/background/idcard-reverse.png b/static/background/idcard-reverse.png
new file mode 100644
index 0000000..f88a834
Binary files /dev/null and b/static/background/idcard-reverse.png differ
diff --git a/static/background/wallet-back.png b/static/background/wallet-back.png
new file mode 100644
index 0000000..5470f61
Binary files /dev/null and b/static/background/wallet-back.png differ
diff --git a/static/background/wallet-code-background.png b/static/background/wallet-code-background.png
new file mode 100644
index 0000000..c5c0627
Binary files /dev/null and b/static/background/wallet-code-background.png differ
diff --git a/static/icons/add-icon.png b/static/icons/add-icon.png
new file mode 100644
index 0000000..1390ef3
Binary files /dev/null and b/static/icons/add-icon.png differ
diff --git a/static/icons/approve-icon.png b/static/icons/approve-icon.png
new file mode 100644
index 0000000..6518639
Binary files /dev/null and b/static/icons/approve-icon.png differ
diff --git a/static/icons/audit-icon.png b/static/icons/audit-icon.png
new file mode 100644
index 0000000..e4329d6
Binary files /dev/null and b/static/icons/audit-icon.png differ
diff --git a/static/icons/checked-icon.png b/static/icons/checked-icon.png
new file mode 100644
index 0000000..9f866ee
Binary files /dev/null and b/static/icons/checked-icon.png differ
diff --git a/static/icons/crystal-icon.png b/static/icons/crystal-icon.png
new file mode 100644
index 0000000..4c1ab9c
Binary files /dev/null and b/static/icons/crystal-icon.png differ
diff --git a/static/icons/e-logo-white.png b/static/icons/e-logo-white.png
new file mode 100644
index 0000000..62ef1e0
Binary files /dev/null and b/static/icons/e-logo-white.png differ
diff --git a/static/icons/e-logo.png b/static/icons/e-logo.png
new file mode 100644
index 0000000..05ca1f8
Binary files /dev/null and b/static/icons/e-logo.png differ
diff --git a/static/icons/equity_arrow_icon.png b/static/icons/equity_arrow_icon.png
new file mode 100644
index 0000000..5daf429
Binary files /dev/null and b/static/icons/equity_arrow_icon.png differ
diff --git a/static/icons/equity_arrow_right.png b/static/icons/equity_arrow_right.png
new file mode 100644
index 0000000..ad089b1
Binary files /dev/null and b/static/icons/equity_arrow_right.png differ
diff --git a/static/icons/equity_arrow_up.png b/static/icons/equity_arrow_up.png
new file mode 100644
index 0000000..9d3bd78
Binary files /dev/null and b/static/icons/equity_arrow_up.png differ
diff --git a/static/icons/equity_coupons_01.png b/static/icons/equity_coupons_01.png
new file mode 100644
index 0000000..ee06cdb
Binary files /dev/null and b/static/icons/equity_coupons_01.png differ
diff --git a/static/icons/equity_coupons_02.png b/static/icons/equity_coupons_02.png
new file mode 100644
index 0000000..2e2eaff
Binary files /dev/null and b/static/icons/equity_coupons_02.png differ
diff --git a/static/icons/equity_coupons_03.png b/static/icons/equity_coupons_03.png
new file mode 100644
index 0000000..071841a
Binary files /dev/null and b/static/icons/equity_coupons_03.png differ
diff --git a/static/icons/equity_nav.png b/static/icons/equity_nav.png
new file mode 100644
index 0000000..aa2badf
Binary files /dev/null and b/static/icons/equity_nav.png differ
diff --git a/static/icons/fire.png b/static/icons/fire.png
new file mode 100644
index 0000000..ccc78e9
Binary files /dev/null and b/static/icons/fire.png differ
diff --git a/static/icons/gemstone-icon.png b/static/icons/gemstone-icon.png
new file mode 100644
index 0000000..39db38f
Binary files /dev/null and b/static/icons/gemstone-icon.png differ
diff --git a/static/icons/goods_buy.png b/static/icons/goods_buy.png
new file mode 100644
index 0000000..634d99a
Binary files /dev/null and b/static/icons/goods_buy.png differ
diff --git a/static/icons/goods_close.png b/static/icons/goods_close.png
new file mode 100644
index 0000000..260ea60
Binary files /dev/null and b/static/icons/goods_close.png differ
diff --git a/static/icons/goods_row.png b/static/icons/goods_row.png
new file mode 100644
index 0000000..50dc5c9
Binary files /dev/null and b/static/icons/goods_row.png differ
diff --git a/static/icons/goods_spot.png b/static/icons/goods_spot.png
new file mode 100644
index 0000000..e835d42
Binary files /dev/null and b/static/icons/goods_spot.png differ
diff --git a/static/icons/listnull-icon.png b/static/icons/listnull-icon.png
new file mode 100644
index 0000000..85e34a4
Binary files /dev/null and b/static/icons/listnull-icon.png differ
diff --git a/static/icons/login-icon.png b/static/icons/login-icon.png
new file mode 100644
index 0000000..9c13aad
Binary files /dev/null and b/static/icons/login-icon.png differ
diff --git a/static/icons/market_icon_high.png b/static/icons/market_icon_high.png
new file mode 100644
index 0000000..025dc74
Binary files /dev/null and b/static/icons/market_icon_high.png differ
diff --git a/static/icons/market_icon_low.png b/static/icons/market_icon_low.png
new file mode 100644
index 0000000..68e03f1
Binary files /dev/null and b/static/icons/market_icon_low.png differ
diff --git a/static/icons/order-null.png b/static/icons/order-null.png
new file mode 100644
index 0000000..e994a40
Binary files /dev/null and b/static/icons/order-null.png differ
diff --git a/static/icons/order_icon_00.png b/static/icons/order_icon_00.png
new file mode 100644
index 0000000..0617cc1
Binary files /dev/null and b/static/icons/order_icon_00.png differ
diff --git a/static/icons/order_icon_01.png b/static/icons/order_icon_01.png
new file mode 100644
index 0000000..4165b8d
Binary files /dev/null and b/static/icons/order_icon_01.png differ
diff --git a/static/icons/order_icon_02.png b/static/icons/order_icon_02.png
new file mode 100644
index 0000000..8949222
Binary files /dev/null and b/static/icons/order_icon_02.png differ
diff --git a/static/icons/order_icon_03.png b/static/icons/order_icon_03.png
new file mode 100644
index 0000000..be4d9a5
Binary files /dev/null and b/static/icons/order_icon_03.png differ
diff --git a/static/icons/order_icon_04.png b/static/icons/order_icon_04.png
new file mode 100644
index 0000000..095d957
Binary files /dev/null and b/static/icons/order_icon_04.png differ
diff --git a/static/icons/payWay_icon_00.png b/static/icons/payWay_icon_00.png
new file mode 100644
index 0000000..ee42a3a
Binary files /dev/null and b/static/icons/payWay_icon_00.png differ
diff --git a/static/icons/payWay_icon_01.png b/static/icons/payWay_icon_01.png
new file mode 100644
index 0000000..65aeaa3
Binary files /dev/null and b/static/icons/payWay_icon_01.png differ
diff --git a/static/icons/property_icon_00.png b/static/icons/property_icon_00.png
new file mode 100644
index 0000000..37b2cd1
Binary files /dev/null and b/static/icons/property_icon_00.png differ
diff --git a/static/icons/property_icon_01.png b/static/icons/property_icon_01.png
new file mode 100644
index 0000000..b67c694
Binary files /dev/null and b/static/icons/property_icon_01.png differ
diff --git a/static/icons/property_poster.png b/static/icons/property_poster.png
new file mode 100644
index 0000000..45ca530
Binary files /dev/null and b/static/icons/property_poster.png differ
diff --git a/static/icons/search-icon.png b/static/icons/search-icon.png
new file mode 100644
index 0000000..0804a8a
Binary files /dev/null and b/static/icons/search-icon.png differ
diff --git a/static/icons/store_codeBack.png b/static/icons/store_codeBack.png
new file mode 100644
index 0000000..a1e5557
Binary files /dev/null and b/static/icons/store_codeBack.png differ
diff --git a/static/icons/store_contBack.png b/static/icons/store_contBack.png
new file mode 100644
index 0000000..c1cd0c7
Binary files /dev/null and b/static/icons/store_contBack.png differ
diff --git a/static/icons/store_down.png b/static/icons/store_down.png
new file mode 100644
index 0000000..bd92972
Binary files /dev/null and b/static/icons/store_down.png differ
diff --git a/static/icons/store_downBack.png b/static/icons/store_downBack.png
new file mode 100644
index 0000000..d0448e6
Binary files /dev/null and b/static/icons/store_downBack.png differ
diff --git a/static/icons/store_icon_icon.png b/static/icons/store_icon_icon.png
new file mode 100644
index 0000000..da7929b
Binary files /dev/null and b/static/icons/store_icon_icon.png differ
diff --git a/static/icons/store_icon_pen.png b/static/icons/store_icon_pen.png
new file mode 100644
index 0000000..89e4b46
Binary files /dev/null and b/static/icons/store_icon_pen.png differ
diff --git a/static/icons/store_icon_row.png b/static/icons/store_icon_row.png
new file mode 100644
index 0000000..be7558f
Binary files /dev/null and b/static/icons/store_icon_row.png differ
diff --git a/static/icons/store_icon_vip.png b/static/icons/store_icon_vip.png
new file mode 100644
index 0000000..8e0e7ee
Binary files /dev/null and b/static/icons/store_icon_vip.png differ
diff --git a/static/icons/store_logistic.png b/static/icons/store_logistic.png
new file mode 100644
index 0000000..2c4cf67
Binary files /dev/null and b/static/icons/store_logistic.png differ
diff --git a/static/icons/ticket-icon.png b/static/icons/ticket-icon.png
new file mode 100644
index 0000000..da60025
Binary files /dev/null and b/static/icons/ticket-icon.png differ
diff --git a/static/icons/tool_icon_00.png b/static/icons/tool_icon_00.png
new file mode 100644
index 0000000..14bc4e4
Binary files /dev/null and b/static/icons/tool_icon_00.png differ
diff --git a/static/icons/tool_icon_01.png b/static/icons/tool_icon_01.png
new file mode 100644
index 0000000..46ca67b
Binary files /dev/null and b/static/icons/tool_icon_01.png differ
diff --git a/static/icons/tool_icon_02.png b/static/icons/tool_icon_02.png
new file mode 100644
index 0000000..fc03a89
Binary files /dev/null and b/static/icons/tool_icon_02.png differ
diff --git a/static/icons/tool_icon_03.png b/static/icons/tool_icon_03.png
new file mode 100644
index 0000000..170d0db
Binary files /dev/null and b/static/icons/tool_icon_03.png differ
diff --git a/static/icons/tool_icon_04.png b/static/icons/tool_icon_04.png
new file mode 100644
index 0000000..f878479
Binary files /dev/null and b/static/icons/tool_icon_04.png differ
diff --git a/static/icons/tool_icon_05.png b/static/icons/tool_icon_05.png
new file mode 100644
index 0000000..ae69992
Binary files /dev/null and b/static/icons/tool_icon_05.png differ
diff --git a/static/icons/tool_icon_06.png b/static/icons/tool_icon_06.png
new file mode 100644
index 0000000..12bc88c
Binary files /dev/null and b/static/icons/tool_icon_06.png differ
diff --git a/static/icons/tool_icon_07.png b/static/icons/tool_icon_07.png
new file mode 100644
index 0000000..9c34926
Binary files /dev/null and b/static/icons/tool_icon_07.png differ
diff --git a/static/icons/tool_icon_08.png b/static/icons/tool_icon_08.png
new file mode 100644
index 0000000..f049d41
Binary files /dev/null and b/static/icons/tool_icon_08.png differ
diff --git a/static/icons/unchecked-icon.png b/static/icons/unchecked-icon.png
new file mode 100644
index 0000000..4154177
Binary files /dev/null and b/static/icons/unchecked-icon.png differ
diff --git a/static/icons/user_icon_00.png b/static/icons/user_icon_00.png
new file mode 100644
index 0000000..71026f2
Binary files /dev/null and b/static/icons/user_icon_00.png differ
diff --git a/static/icons/user_icon_01.png b/static/icons/user_icon_01.png
new file mode 100644
index 0000000..c749a34
Binary files /dev/null and b/static/icons/user_icon_01.png differ
diff --git a/static/icons/user_icon_02.png b/static/icons/user_icon_02.png
new file mode 100644
index 0000000..11d2c67
Binary files /dev/null and b/static/icons/user_icon_02.png differ
diff --git a/static/icons/user_icon_03.png b/static/icons/user_icon_03.png
new file mode 100644
index 0000000..0df3413
Binary files /dev/null and b/static/icons/user_icon_03.png differ
diff --git a/static/icons/user_icon_04.png b/static/icons/user_icon_04.png
new file mode 100644
index 0000000..948cfb5
Binary files /dev/null and b/static/icons/user_icon_04.png differ
diff --git a/static/icons/vip_icon.png b/static/icons/vip_icon.png
new file mode 100644
index 0000000..3f8a186
Binary files /dev/null and b/static/icons/vip_icon.png differ
diff --git a/static/icons/vip_pay_title.png b/static/icons/vip_pay_title.png
new file mode 100644
index 0000000..88a3e4b
Binary files /dev/null and b/static/icons/vip_pay_title.png differ
diff --git a/static/icons/vip_privilege_tips.png b/static/icons/vip_privilege_tips.png
new file mode 100644
index 0000000..f11ef3f
Binary files /dev/null and b/static/icons/vip_privilege_tips.png differ
diff --git a/static/icons/vip_privilege_tittle.png b/static/icons/vip_privilege_tittle.png
new file mode 100644
index 0000000..03aa18d
Binary files /dev/null and b/static/icons/vip_privilege_tittle.png differ
diff --git a/static/icons/vip_yearsIcon.png b/static/icons/vip_yearsIcon.png
new file mode 100644
index 0000000..b28bc0a
Binary files /dev/null and b/static/icons/vip_yearsIcon.png differ
diff --git a/static/icons/wechat.png b/static/icons/wechat.png
new file mode 100644
index 0000000..f4ae348
Binary files /dev/null and b/static/icons/wechat.png differ
diff --git a/static/imgs/company-icon.png b/static/imgs/company-icon.png
new file mode 100644
index 0000000..ad8e0f4
Binary files /dev/null and b/static/imgs/company-icon.png differ
diff --git a/static/imgs/crystal-sign.png b/static/imgs/crystal-sign.png
new file mode 100644
index 0000000..b9fd786
Binary files /dev/null and b/static/imgs/crystal-sign.png differ
diff --git a/static/imgs/link-wechat.png b/static/imgs/link-wechat.png
new file mode 100644
index 0000000..2775884
Binary files /dev/null and b/static/imgs/link-wechat.png differ
diff --git a/static/imgs/mine-about.png b/static/imgs/mine-about.png
new file mode 100644
index 0000000..88cca13
Binary files /dev/null and b/static/imgs/mine-about.png differ
diff --git a/static/imgs/mine-self-name.png b/static/imgs/mine-self-name.png
new file mode 100644
index 0000000..d527b4c
Binary files /dev/null and b/static/imgs/mine-self-name.png differ
diff --git a/static/imgs/reset-info.png b/static/imgs/reset-info.png
new file mode 100644
index 0000000..06e2ea6
Binary files /dev/null and b/static/imgs/reset-info.png differ
diff --git a/static/imgs/self-icon.png b/static/imgs/self-icon.png
new file mode 100644
index 0000000..09c8644
Binary files /dev/null and b/static/imgs/self-icon.png differ
diff --git a/static/imgs/user-avatar.png b/static/imgs/user-avatar.png
new file mode 100644
index 0000000..8f95acc
Binary files /dev/null and b/static/imgs/user-avatar.png differ
diff --git a/static/imgs/user-crystalMark-grey.png b/static/imgs/user-crystalMark-grey.png
new file mode 100644
index 0000000..567daeb
Binary files /dev/null and b/static/imgs/user-crystalMark-grey.png differ
diff --git a/static/tabBar/tabBar_icon_00.png b/static/tabBar/tabBar_icon_00.png
index a711622..2c3c43a 100644
Binary files a/static/tabBar/tabBar_icon_00.png and b/static/tabBar/tabBar_icon_00.png differ
diff --git a/static/tabBar/tabBar_icon_01.png b/static/tabBar/tabBar_icon_01.png
index 1feaaaa..9485e91 100644
Binary files a/static/tabBar/tabBar_icon_01.png and b/static/tabBar/tabBar_icon_01.png differ
diff --git a/static/tabBar/tabBar_icon_02.png b/static/tabBar/tabBar_icon_02.png
index a7a2c2c..1395dfc 100644
Binary files a/static/tabBar/tabBar_icon_02.png and b/static/tabBar/tabBar_icon_02.png differ
diff --git a/static/tabBar/tabBar_icon_03.png b/static/tabBar/tabBar_icon_03.png
deleted file mode 100644
index d3c6a3f..0000000
Binary files a/static/tabBar/tabBar_icon_03.png and /dev/null differ
diff --git a/static/tabBar/tabBar_show_00.png b/static/tabBar/tabBar_show_00.png
index 0a08dec..2f52445 100644
Binary files a/static/tabBar/tabBar_show_00.png and b/static/tabBar/tabBar_show_00.png differ
diff --git a/static/tabBar/tabBar_show_01.png b/static/tabBar/tabBar_show_01.png
index d5a54de..3bd9086 100644
Binary files a/static/tabBar/tabBar_show_01.png and b/static/tabBar/tabBar_show_01.png differ
diff --git a/static/tabBar/tabBar_show_02.png b/static/tabBar/tabBar_show_02.png
index 8e3bb5b..a256c1b 100644
Binary files a/static/tabBar/tabBar_show_02.png and b/static/tabBar/tabBar_show_02.png differ
diff --git a/static/tabBar/tabBar_show_03.png b/static/tabBar/tabBar_show_03.png
deleted file mode 100644
index 85bf12a..0000000
Binary files a/static/tabBar/tabBar_show_03.png and /dev/null differ
diff --git a/uni.scss b/uni.scss
index b5dd4ec..8336b3a 100644
--- a/uni.scss
+++ b/uni.scss
@@ -12,7 +12,8 @@
  * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
  */
 
-@import "uview-ui/theme.scss";
+@import 'scss/globa.scss';
+@import "uview-ui/theme.scss";
 
 /* 颜色变量 */
 
diff --git a/uni_modules/lime-f2/changelog.md b/uni_modules/lime-f2/changelog.md
new file mode 100644
index 0000000..d96c8d1
--- /dev/null
+++ b/uni_modules/lime-f2/changelog.md
@@ -0,0 +1,149 @@
+## 0.5.1（2021-05-14）
+- feat: props 增加 `isDisableScroll` ，触摸图表时是否禁止页面滚动
+- feat: props 增加 `webviewStyles` ，webview 的样式, 仅nvue有效
+## 0.5.0（2021-05-13）
+- docs: 插件用到了css 预编译器 [stylus](https://ext.dcloud.net.cn/plugin?name=compile-stylus) 请安装它
+## [代码示例：http://liangei.gitee.io/limeui/#/f2-example](http://liangei.gitee.io/limeui/#/f2-example)
+## 0.4.9（2021-05-12）
+- fix: 修复 百度平台 多个图表时 只生效一个的bug
+## 0.4.8（2021-05-10）
+- feat: 增加 `destroy` 方法，用于销毁实例
+- feat: 增加 `canvasToTempFilePath` 方法，用于生成图片
+```js
+this.$refs.chart.canvasToTempFilePath({success: res => {
+	console.log('tempFilePath:', res.tempFilePath)
+}})
+```
+## [代码示例：http://liangei.gitee.io/limeui/#/f2-example](http://liangei.gitee.io/limeui/#/f2-example)
+
+## 0.4.7（2021-05-10）
+- chore: F2 版本更新至 3.8.7
+## 0.4.6（2021-05-05）
+- docs: nvue 使用文档更新 
+## [代码示例：http://liangei.gitee.io/limeui/#/f2-example](http://liangei.gitee.io/limeui/#/f2-example)
+## 0.4.5.7（2021-04-30）
+- chore: nvue 增强 支持 console.log 输出到控制台方便调试
+- docs: nvue 使用文档更新，不再需要声明F2
+## 0.4.5.6（2021-04-29）
+- fix: nvue 修复打包后 函数字符串被压缩无效的问题
+- 若发现打包依然无效可使用直接返回字符串
+```js 
+this.$refs.chart.init(config => {
+	return `
+		const chart = new F2.Chart(config);
+		chart.source(data);
+		chart
+			.interval()
+			.position('genre*sold')
+			.color('genre');
+		chart.render();
+		return chart;
+	`
+},{data});
+```
+- chore: 新增支持词云能力，头条小程序需要1.78.0后
+## [代码示例：http://liangei.gitee.io/limeui/#/f2-example](http://liangei.gitee.io/limeui/#/f2-example)
+## 0.4.5.5（2021-04-25）
+- fix: 修复新版谷歌浏览器(90.0.4430.85) 报 `transform ` 的问题
+## 0.4.5.4（2021-04-23）
+- fix: 修复支付宝小程序尺寸问题
+## [代码示例：http://liangei.gitee.io/limeui/#/f2-example](http://liangei.gitee.io/limeui/#/f2-example)
+## 0.4.5.3（2021-04-22）
+- chore:  删除多余console.log
+## 0.4.5.2（2021-04-21）
+- chore: 修复字节颜色报错的问题。
+## 0.4.5.1（2021-04-18）
+- chore: 增加默认尺寸 **300 x 300** , 当父级没有尺寸时启用。
+- 由于 F2 **云图** 依赖的 `@antv/data-set` 只支持H5创建Canvas，所以暂时只有 H5 支持。
+- 由于 F2 对绘制地图 不佳，故地图示例南海诸岛使用图片。
+## [代码示例：http://liangei.gitee.io/limeui/#/f2-example](http://liangei.gitee.io/limeui/#/f2-example)
+## 0.4.5（2021-04-16）
+- fix: 修复 app-vue 字体固定问题
+- fix: 修复 h5 app-vue 画多边形尺寸过大
+- fix: 修复 初始化 func 问题
+- docs: 增加 矩形式树图 示例
+- 由于 F2 **云图** 依赖的 `@antv/data-set` 只支持H5创建Canvas，所以暂时只有 H5 支持。
+## 0.4.4.1（2021-04-16）
+- chore: 更改 `webview` 地址
+## 0.4.4（2021-04-16）
+- chore: `nvue` 增加 chart.$emit 事件，主要用于图表交互，接收动作事件数据。
+```html
+<l-f2 @change="onChange" />
+```
+```js
+chart.tooltip({
+	onChange: (ev) => {
+		chart.$emit('change', ev)
+	}
+})
+```
+## [代码示例：http://liangei.gitee.io/limeui/#/f2-example](http://liangei.gitee.io/limeui/#/f2-example)
+## 0.4.3.1（2021-04-14）
+- docs: 更新官网上的代码示例！复制粘贴即用
+## [代码示例 http://liangei.gitee.io/limeui/#/f2-example](http://liangei.gitee.io/limeui/#/f2-example)
+## 0.4.3（2021-04-13）
+- chore: 增加`onInit`的属性函数，直接向图表传递初始化函数
+```html
+<l-f2 :onInit="onInitChart" />
+```
+```js
+export default {
+	data: ()=>({
+		onInitChart: config => {
+			const chart = new F2.Chart(config);
+			const data = [
+				{ value: 63.4, city: 'New York', date: '2011-10-01' },
+				{ value: 62.7, city: 'Alaska', date: '2011-10-01' },
+				{ value: 72.2, city: 'Austin', date: '2011-10-01' },
+				{ value: 58, city: 'New York', date: '2011-10-02' },
+				{ value: 59.9, city: 'Alaska', date: '2011-10-02' },
+				{ value: 67.7, city: 'Austin', date: '2011-10-02' },
+				{ value: 53.3, city: 'New York', date: '2011-10-03' },
+				{ value: 59.1, city: 'Alaska', date: '2011-10-03' },
+				{ value: 69.4, city: 'Austin', date: '2011-10-03' },
+			  ];
+			  chart.source(data, {
+				date: {
+				  range: [0, 1],
+				  type: 'timeCat',
+				  mask: 'MM-DD'
+				},
+				value: {
+				  max: 300,
+				  tickCount: 4
+				}
+			  });
+			  chart.area().position('date*value').color('city').adjust('stack');
+			  chart.line().position('date*value').color('city').adjust('stack');
+			  chart.render();
+			  // 注意：需要把chart return 出来
+			  return chart;
+		}
+	})
+}
+```
+## 0.4.2（2021-04-09）
+- chore: `nvue` webview 改为网络地址
+## 0.4.1（2021-04-09）
+- chore: `redraw(callback)` 更名为 `reset(callback)`
+- fix: 修复 `nvue` 某些情况下无法传递函数字符串
+- feat: 增加 `nvue` 下使用 `insertCss` 给节点设置 style
+## 0.4.0（2021-04-08）
+- chore: antv F2 version 更新到 `3.8.6`
+- feat: `f2-all`,`f2-simple`等文件，默认只提供`f2.min.js`,如果需要`f2-all`或`f2-simple`可去码云下载按自已需要引入！
+- fix: 修复钉钉小程序measureText undefined的问题
+- fix: 修复小程序因`hammer`引用报错
+## 0.3.0（2021-04-06）
+- feat: `redraw(callback)` 方法重绘
+- feat: `clear()` 方法清空图表
+- feat: `changeData(data)` 方法更新图表，需要传数据
+- feat: `repaint()` 方法更新图表：`source` 数据源 更新后，在需要的时候调用
+- feat: `source` 数据源 和 `is-auto-play` 开启自动更新，配置这两个参数只要 `source` 数据源更新，就会更新图表
+## 0.2.2（2021-04-05）
+- fix: 修复微信小程序缺少`Transform`报错问题
+## 0.2.1（2021-04-04）
+- chore:  考虑到不是所有人需要 `nvue`，所以 `webview` 改为网络路径 , 当然你也可以把html下载放置到项目根目录的`hybrid`文件夹下
+## 0.2.0（2021-04-04）
+- chore:  基于 `webview` 实现兼容 `nvue`
+## 0.1.0（2021-04-02）
+- chore:  第一次上传，基本全端兼容，使用方法与官网一致。
diff --git a/uni_modules/lime-f2/components/lime-f2/canvas.js b/uni_modules/lime-f2/components/lime-f2/canvas.js
new file mode 100644
index 0000000..0e107e5
--- /dev/null
+++ b/uni_modules/lime-f2/components/lime-f2/canvas.js
@@ -0,0 +1,121 @@
+import {
+	pixelRatio,
+	sleep
+} from './utils';
+
+const UNI_CANVAS_CONTEXT_MAP = {
+	// #ifndef MP-WEIXIN
+	fillStyle: 'FillStyle',
+	fontSize: 'FontSize',
+	globalAlpha: 'GlobalAlpha',
+	opacity: 'GlobalAlpha',
+	lineCap: 'LineCap',
+	lineJoin: 'LineJoin',
+	lineWidth: 'LineWidth',
+	miterLimit: 'MiterLimit',
+	strokeStyle: 'StrokeStyle',
+	textAlign: 'TextAlign',
+	textBaseline: 'TextBaseline',
+	shadow: 'Shadow',
+	// #endif
+	// #ifdef MP-TOUTIAO || H5 || APP-PLUS
+	font: 'FontSize',
+	// #endif
+};
+
+function strLen(str) {
+	let len = 0;
+	for (let i = 0; i < str.length; i++) {
+		if (str.charCodeAt(i) > 0 && str.charCodeAt(i) < 128) {
+			len++;
+		} else {
+			len += 2;
+		}
+	}
+	return len;
+}
+
+// 头条小程序目前仅支持 setFontSize
+// f2 会将所有属性整合为 font 简写，从中提取 fontSize 支持
+const fontSizeReg = /(\d*\.?\d*)px/;
+const colorReg = /#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])\b/g;
+export default (ctx) => {
+	// #ifdef H5 || APP-PLUS
+	ctx.uniTransform = ctx.transform
+	ctx.transform = (...agrs) => {
+		if (ctx.draw && agrs[6]) {
+			agrs[4] *= pixelRatio
+			agrs[5] *= pixelRatio
+		}
+		if (agrs.length > 6) {
+			agrs.pop()
+		}
+		ctx.uniTransform(...agrs)
+	}
+	// #endif
+	// #ifdef MP-ALIPAY
+	ctx.canvasGetImageData = ctx.getImageData
+	ctx.getImageData = null
+	// #endif
+	if (!ctx.getImageData) {
+		ctx.getImageData = (...agrs) => {
+			const [x, y, width, height] = agrs
+			return new Promise(resolve => {
+				const parms = {
+					canvasId: ctx.id || ctx.canvasId,
+					x,
+					y,
+					width,
+					height,
+					success: res => {
+						resolve(res.data)
+					}
+				}
+				// #ifndef MP-ALIPAY || MP-TOUTIAO
+				uni.canvasGetImageData(parms)
+				// #endif
+				// #ifdef MP-ALIPAY || MP-TOUTIAO
+				ctx.canvasGetImageData(parms)
+				// #endif
+			})
+		}
+	}
+	// 钉钉小程序框架不支持 measureText 方法，用此方法 mock
+	if (!ctx.measureText) {
+		ctx.measureText = text => {
+			let fontSize = 12;
+			const font = ctx.__font;
+			if (font) {
+				fontSize = parseInt(font.split(' ')[3], 10);
+			}
+			fontSize /= 2;
+			return {
+				width: strLen(text) * fontSize
+			};
+		}
+	}
+	Object.keys(UNI_CANVAS_CONTEXT_MAP).forEach(key => {
+		Object.defineProperty(ctx, key, {
+			set(val) {
+				const name = `set${UNI_CANVAS_CONTEXT_MAP[key]}`;
+				if (!ctx[name]) {
+					return;
+				}
+				if (key === 'font' && fontSizeReg.test(val)) {
+					const match = fontSizeReg.exec(val);
+					ctx[name](match[1]);
+					return;
+				}
+				if (key === 'shadow' && Array.isArray(val)) {
+					ctx[name](...val);
+					return;
+				}
+				if(colorReg.test(val)) {
+					val = val.replace(colorReg, '#$1$1$2$2$3$3')
+				}
+				ctx[name](val);
+			}
+		});
+	});
+	return ctx
+}
diff --git a/uni_modules/lime-f2/components/lime-f2/f2.min.js b/uni_modules/lime-f2/components/lime-f2/f2.min.js
new file mode 100644
index 0000000..e2336d6
--- /dev/null
+++ b/uni_modules/lime-f2/components/lime-f2/f2.min.js
@@ -0,0 +1,15 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).F2={})}(this,(function(t){"use strict";var e=function(t){return null!==t&&"function"!=typeof t&&isFinite(t.length)},i=function(t,i){if(!e(t))return t;for(var n=[],r=0;r<t.length;r++){var a=t[r];i(a,r)&&n.push(a)}return n},n={}.toString,r=function(t,e){return n.call(t)==="[object "+e+"]"},a=function(t){return r(t,"Function")},s=function(t){return null==t},o=function(t){return Array.isArray?Array.isArray(t):r(t,"Array")},h=function(t){var e=typeof t;return null!==t&&"object"===e||"function"===e};function u(t,e){if(t)if(o(t))for(var i=0,n=t.length;i<n&&!1!==e(t[i],i);i++);else if(h(t))for(var r in t)if(t.hasOwnProperty(r)&&!1===e(t[r],r))break}var l=Object.keys?function(t){return Object.keys(t)}:function(t){var e=[];return u(t,(function(i,n){a(t)&&"prototype"===n||e.push(n)})),e};var c=function(t){return"object"==typeof t&&null!==t},f=function(t){if(!c(t)||!r(t,"Object"))return!1;if(null===Object.getPrototypeOf(t))return!0;for(var e=t;null!==Object.getPrototypeOf(e);)e=Object.getPrototypeOf(e);return Object.getPrototypeOf(t)===e};var g=function(t){return r(t,"String")},p=function(t){var i=[];return u(t,(function(t){(function(t,i){return!!e(t)&&t.indexOf(i)>-1})(i,t)||i.push(t)})),i};function d(t){if(e(t))return t[0]}function v(t){if(e(t)){return t[t.length-1]}}var y=function(t,e){var i=e.toString(),n=i.indexOf(".");if(-1===n)return Math.round(t);var r=i.substr(n+1).length;return r>20&&(r=20),parseFloat(t.toFixed(r))},m=function(t){return r(t,"Number")},x=function(t){return s(t)?"":t.toString()},_=function(t){var e=x(t);return e.charAt(0).toLowerCase()+e.substring(1)};function S(t,e){return t&&e?t.replace(/\\?\{([^{}]+)\}/g,(function(t,i){return"\\"===t.charAt(0)?t.slice(1):void 0===e[i]?"":e[i]})):t}var M=function(t){var e=x(t);return e.charAt(0).toUpperCase()+e.substring(1)},w={}.toString,b=function(t){return r(t,"Boolean")},C=function(t){return r(t,"Date")},P=Object.prototype;function k(t,e){for(var i in e)e.hasOwnProperty(i)&&"constructor"!==i&&void 0!==e[i]&&(t[i]=e[i])}function T(t,e,i,n){return e&&k(t,e),i&&k(t,i),n&&k(t,n),t}function D(t,e,i,n){for(var r in i=i||0,n=n||5,e)if(e.hasOwnProperty(r)){var a=e[r];null!==a&&f(a)?(f(t[r])||(t[r]={}),i<n?D(t[r],a,i+1,n):t[r]=e[r]):o(a)?(t[r]=[],t[r]=t[r].concat(a)):void 0!==a&&(t[r]=a)}}var A=function(t){for(var e=[],i=1;i<arguments.length;i++)e[i-1]=arguments[i];for(var n=0;n<e.length;n+=1)D(t,e[n]);return t},I=function(t,i){if(!e(t))return-1;var n=Array.prototype.indexOf;if(n)return n.call(t,i);for(var r=-1,a=0;a<t.length;a++)if(t[a]===i){r=a;break}return r},Y=Object.prototype.hasOwnProperty;function O(t){if(s(t))return!0;if(e(t))return!t.length;var i=function(t){return w.call(t).replace(/^\[object /,"").replace(/]$/,"")}(t);if("Map"===i||"Set"===i)return!t.size;if(function(t){var e=t&&t.constructor;return t===("function"==typeof e&&e.prototype||P)}(t))return!Object.keys(t).length;for(var n in t)if(Y.call(t,n))return!1;return!0}var E=function(t,i){if(t===i)return!0;if(!t||!i)return!1;if(g(t)||g(i))return!1;if(e(t)||e(i)){if(t.length!==i.length)return!1;for(var n=!0,r=0;r<t.length&&(n=E(t[r],i[r]));r++);return n}if(c(t)||c(i)){var a=Object.keys(t),s=Object.keys(i);if(a.length!==s.length)return!1;for(n=!0,r=0;r<a.length&&(n=E(t[a[r]],i[a[r]]));r++);return n}return!1},N=function(t,i){if(!e(t))return t;for(var n=[],r=0;r<t.length;r++){var a=t[r];n.push(i(a,r))}return n};function F(t){return s(t)?0:e(t)?t.length:Object.keys(t).length}function z(t){for(var e=[],i=0,n=t.length;i<n;i++)e=e.concat(t[i]);return e}function B(t,e){for(var i=[],n={},r=0,a=t.length;r<a;r++){var h=t[r][e];s(h)||(o(h)?u(h,(function(t){n[t]||(i.push(t),n[t]=!0)})):n[h]||(i.push(h),n[h]=!0))}return i}function X(t,e){for(var i=null,n=0,r=t.length;n<r;n++){var a=t[n][e];if(!s(a)){i=o(a)?a[0]:a;break}}return i}function L(t,e){if(!e)return{0:t};for(var i=function(t){for(var i="_",n=0,r=e.length;n<r;n++)i+=t[e[n]]&&t[e[n]].toString();return i},n={},r=0,a=t.length;r<a;r++){var s=t[r],o=i(s);n[o]?n[o].push(s):n[o]=[s]}return n}function j(t,e,i){if(void 0===i&&(i={}),!e)return[t];var n=L(t,e),r=[];if(1===e.length&&i[e[0]])u(i[e[0]],(function(t){t="_"+t,r.push(n[t])}));else for(var a in n)r.push(n[a]);return r}function G(t,e){if(t){var i=t.indexOf(e);-1!==i&&t.splice(i,1)}}function R(t){if(!t.length)return{min:0,max:0};var e=Math.max.apply(null,t);return{min:Math.min.apply(null,t),max:e}}var H=Object.freeze({__proto__:null,merge:z,values:B,firstValue:X,group:j,groupToMap:L,remove:G,getRange:R}),W=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0},V="object"==typeof wx&&"function"==typeof wx.getSystemInfoSync,q="object"==typeof my&&"function"==typeof my.getSystemInfoSync,Z=typeof global&&!1,U="undefined"!=typeof window&&void 0!==window.document&&void 0!==window.sessionStorage;function J(t){return!(!t||"object"!=typeof t)&&(!(1!==t.nodeType||!t.nodeName)||!!t.isCanvasElement)}function $(){return window&&window.devicePixelRatio||1}function K(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)}function Q(t){var e=K(t,"width");return"auto"===e&&(e=t.offsetWidth),parseFloat(e)}function tt(t){var e=K(t,"height");return"auto"===e&&(e=t.offsetHeight),parseFloat(e)}function et(t){return t?document.getElementById(t):null}function it(t,e){var i=e.get("el");if(!i)return t;var n=i.getBoundingClientRect(),r=n.top,a=n.left,s=parseFloat(K(i,"padding-left")),o=parseFloat(K(i,"padding-top"));return{x:t.x-a-s,y:t.y-r-o}}function nt(t,e,i){t.addEventListener(e,i,W)}function rt(t,e,i){t.removeEventListener(e,i,W)}function at(t,e){var i=e.get("landscape");if(!i)return t;if(a(i))return i(t,e);var n=e.get("height");return{x:t.y,y:n-t.x}}function st(t,e){var i=t.touches;if(!i)return[at(it({x:t.clientX,y:t.clientY},e),e)];i.length||(i=t.changedTouches||[]);for(var n=[],r=0,a=i.length;r<a;r++){var s=i[r],o=s.x,h=s.y,u=s.clientX,l=s.clientY,c=void 0;c=m(o)||m(h)?{x:o,y:h}:it({x:u,y:l},e),n.push(at(c,e))}return n}function ot(t,e){var i=st(t,e.get("canvas"))[0]||{};return{type:t.type,chart:e,native:t,x:i.x,y:i.y}}function ht(t,e,i){return i||(i=document.createElement("canvas").getContext("2d")),i.font=e||"12px sans-serif",i.measureText(t)}function ut(t){var e,i,n,r;return m(t)||g(t)?e=n=r=i=t:o(t)&&(e=t[0],i=s(t[1])?t[0]:t[1],n=s(t[2])?t[0]:t[2],r=s(t[3])?i:t[3]),[e,i,n,r]}function lt(t,e){return void 0===t||"string"==typeof t&&-1!==t.indexOf(e)}function ct(t){return g(t)&&(t=t.indexOf("T")>0?new Date(t).getTime():new Date(t.replace(/-/gi,"/")).getTime()),C(t)&&(t=t.getTime()),t}var ft=Object.freeze({__proto__:null,Array:H,upperFirst:M,lowerFirst:_,isString:g,isNumber:m,isBoolean:b,isFunction:a,isDate:C,isArray:o,isNil:s,isObject:h,isPlainObject:f,isEqual:E,deepMix:A,mix:T,each:u,uniq:p,find:function(t,e){if(!o(t))return null;var i;if(a(e)&&(i=e),f(e)&&(i=function(t){return function(t,e){var i=l(e),n=i.length;if(s(t))return!n;for(var r=0;r<n;r+=1){var a=i[r];if(e[a]!==t[a]||!(a in t))return!1}return!0}(t,e)}),i)for(var n=0;n<t.length;n+=1)if(i(t[n]))return t[n];return null},isObjectValueEqual:function(t,e){t=Object.assign({},t),e=Object.assign({},e);var i=Object.getOwnPropertyNames(t),n=Object.getOwnPropertyNames(e);if(i.length!==n.length)return!1;for(var r=0,a=i.length;r<a;r++){var s=i[r];if(t[s]!==e[s])return!1}return!0},parsePadding:ut,directionEnabled:lt,toTimeStamp:ct,substitute:S,isWx:V,isMy:q,isNode:Z,isBrowser:U,isCanvasElement:J,getPixelRatio:$,getStyle:K,getWidth:Q,getHeight:tt,getDomById:et,getRelativePosition:it,addEventListener:nt,removeEventListener:rt,createEvent:ot,convertPoints:st,measureText:ht}),gt={label:{fill:"#808080",fontSize:10},line:{stroke:"#E8E8E8",lineWidth:1},grid:{type:"line",stroke:"#E8E8E8",lineWidth:1,lineDash:[2]},tickLine:null,labelOffset:7.5},pt={fontFamily:'"Helvetica Neue", "San Francisco", Helvetica, Tahoma, Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", sans-serif',defaultColor:"#1890FF",pixelRatio:1,padding:"auto",appendPadding:15,colors:["#1890FF","#2FC25B","#FACC14","#223273","#8543E0","#13C2C2","#3436C7","#F04864"],shapes:{line:["line","dash"],point:["circle","hollowCircle"]},sizes:[4,10],axis:{common:gt,bottom:T({},gt,{grid:null}),left:T({},gt,{line:null}),right:T({},gt,{line:null}),circle:T({},gt,{line:null}),radius:T({},gt,{labelOffset:4})},shape:{line:{lineWidth:2,lineJoin:"round",lineCap:"round"},point:{lineWidth:0,size:3},area:{fillOpacity:.1}},_defaultAxis:gt},dt={general:{title:"这是一个图表，",withTitle:"这是一个关于“{title}”的图表。"},coord:{cartesian:"X轴是{xLabel}Y轴是{yLabel}"},scale:{linear:"数值型，数据最小值为{min}，最大值为{max}；",cat:"分类型, 分类类型有：{values}；",timeCat:"时间型，时间范围从{start}到{end}；"},geometry:{prefix:"共有{count}种分类组成，",oneData:"第{index}类是{name}，数据是{values};",partData:"第{index}类是{name}，共有{count}项数据，前{part}项是{values};",allData:"第{index}类是{name}，有{count}项数据，分别是{values};"},legend:{prefix:"图例分类有："}},vt={version:"3.8.7",scales:{},widthRatio:{column:.5,rose:.999999,multiplePie:3/4},lineDash:[4,4],lang:dt};function yt(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function mt(){return(mt=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var n in i)Object.prototype.hasOwnProperty.call(i,n)&&(t[n]=i[n])}return t}).apply(this,arguments)}function xt(t,e){t.prototype=Object.create(e.prototype),t.prototype.constructor=t,t.__proto__=e}function _t(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}vt.setTheme=function(t){A(vt,t)},vt.setTheme(pt);var St=function(){function t(){this.__events={}}var e=t.prototype;return e.on=function(t,e){if(t&&e){var i=this.__events[t]||[];i.push(e),this.__events[t]=i}},e.emit=function(t,e){var i=this;if(h(t)&&(t=(e=t)&&e.type),t){var n=this.__events[t];n&&n.length&&n.forEach((function(t){t.call(i,e)}))}},e.off=function(t,e){var i=this.__events,n=i[t];if(n&&n.length)if(e)for(var r=0,a=n.length;r<a;r++)n[r]===e&&(n.splice(r,1),r--);else delete i[t]},t}(),Mt=function(t){xt(i,t);var e=i.prototype;function i(e){var i,n={},r=(i=t.call(this)||this).getDefaultCfg();return i._attrs=n,T(n,r,e),i}return e.getDefaultCfg=function(){return{}},e.get=function(t){return this._attrs[t]},e.set=function(t,e){this._attrs[t]=e},e.destroy=function(){this._attrs={},this.destroyed=!0},i}(St),wt=function(){function t(t){T(this,t),this._init()}var e=t.prototype;return e._init=function(){var t=this.start,e=this.end,i=Math.min(t.x,e.x),n=Math.max(t.x,e.x),r=Math.min(t.y,e.y),a=Math.max(t.y,e.y);this.tl={x:i,y:r},this.tr={x:n,y:r},this.bl={x:i,y:a},this.br={x:n,y:a},this.width=n-i,this.height=a-r},e.reset=function(t,e){this.start=t,this.end=e,this._init()},e.isInRange=function(t,e){h(t)&&(e=t.y,t=t.x);var i=this.tl,n=this.br;return i.x<=t&&t<=n.x&&i.y<=e&&e<=n.y},t}(),bt={generateDefault:function(){return[1,0,0,1,0,0]},isChanged:function(t){return 1!==t[0]||0!==t[1]||0!==t[2]||1!==t[3]||0!==t[4]||0!==t[5]},multiply:function(t,e){return[t[0]*e[0]+t[2]*e[1],t[1]*e[0]+t[3]*e[1],t[0]*e[2]+t[2]*e[3],t[1]*e[2]+t[3]*e[3],t[0]*e[4]+t[2]*e[5]+t[4],t[1]*e[4]+t[3]*e[5]+t[5]]},scale:function(t,e,i){return t[0]=e[0]*i[0],t[1]=e[1]*i[0],t[2]=e[2]*i[1],t[3]=e[3]*i[1],t[4]=e[4],t[5]=e[5],t},rotate:function(t,e,i){var n=Math.cos(i),r=Math.sin(i),a=e[0]*n+e[2]*r,s=e[1]*n+e[3]*r,o=e[0]*-r+e[2]*n,h=e[1]*-r+e[3]*n;return t[0]=a,t[1]=s,t[2]=o,t[3]=h,t[4]=e[4],t[5]=e[5],t},translate:function(t,e,i){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=e[4]+e[0]*i[0]+e[2]*i[1],t[5]=e[5]+e[1]*i[0]+e[3]*i[1],t},transform:function(t,e){for(var i=[].concat(t),n=0,r=e.length;n<r;n++){var a=e[n];switch(a[0]){case"t":bt.translate(i,i,[a[1],a[2]]);break;case"s":bt.scale(i,i,[a[1],a[2]]);break;case"r":bt.rotate(i,i,a[1])}}return i}},Ct={create:function(){return[0,0]},length:function(t){var e=t[0],i=t[1];return Math.sqrt(e*e+i*i)},normalize:function(t,e){var i=this.length(e);return 0===i?(t[0]=0,t[1]=0):(t[0]=e[0]/i,t[1]=e[1]/i),t},add:function(t,e,i){return t[0]=e[0]+i[0],t[1]=e[1]+i[1],t},sub:function(t,e,i){return t[0]=e[0]-i[0],t[1]=e[1]-i[1],t},scale:function(t,e,i){return t[0]=e[0]*i,t[1]=e[1]*i,t},dot:function(t,e){return t[0]*e[0]+t[1]*e[1]},direction:function(t,e){return t[0]*e[1]-e[0]*t[1]},angle:function(t,e){var i=this.dot(t,e)/(this.length(t)*this.length(e));return Math.acos(i)},angleTo:function(t,e,i){var n=this.angle(t,e),r=this.direction(t,e)>=0;return i?r?2*Math.PI-n:n:r?n:2*Math.PI-n},zero:function(t){return 0===t[0]&&0===t[1]},distance:function(t,e){var i=e[0]-t[0],n=e[1]-t[1];return Math.sqrt(i*i+n*n)},clone:function(t){return[t[0],t[1]]},min:function(t,e,i){return t[0]=Math.min(e[0],i[0]),t[1]=Math.min(e[1],i[1]),t},max:function(t,e,i){return t[0]=Math.max(e[0],i[0]),t[1]=Math.max(e[1],i[1]),t},transformMat2d:function(t,e,i){var n=e[0],r=e[1];return t[0]=i[0]*n+i[2]*r+i[4],t[1]=i[1]*n+i[3]*r+i[5],t}},Pt=[1,0,0,1,0,0],kt=function(){var t=e.prototype;function e(t){var e,i;this._initDefaultCfg(),T(this,t),this.plot?(e=this.plot.bl,i=this.plot.tr,this.start=e,this.end=i):(e=this.start,i=this.end),this.init(e,i)}return t._initDefaultCfg=function(){},t._scale=function(t,e){var i=this.matrix,n=this.center;bt.translate(i,i,[n.x,n.y]),bt.scale(i,i,[t,e]),bt.translate(i,i,[-n.x,-n.y])},t.init=function(t,e){this.matrix=[].concat(Pt),this.center={x:(e.x-t.x)/2+t.x,y:(e.y-t.y)/2+t.y},this.scale&&this._scale(this.scale[0],this.scale[1])},t.convertPoint=function(t){var e=this._convertPoint(t),i=e.x,n=e.y;if(!bt.isChanged(this.matrix))return{x:i,y:n};var r=[i,n];return Ct.transformMat2d(r,r,this.matrix),{x:r[0],y:r[1]}},t.invertPoint=function(t){return this._invertPoint(t)},t._convertPoint=function(t){return t},t._invertPoint=function(t){return t},t.reset=function(t){this.plot=t;var e=t.bl,i=t.tr;this.start=e,this.end=i,this.init(e,i)},e}(),Tt=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){this.type="cartesian",this.transposed=!1,this.isRect=!0},i.init=function(e,i){t.prototype.init.call(this,e,i),this.x={start:e.x,end:i.x},this.y={start:e.y,end:i.y}},i._convertPoint=function(t){var e=this.transposed,i=e?"y":"x",n=e?"x":"y",r=this.x,a=this.y;return{x:r.start+(r.end-r.start)*t[i],y:a.start+(a.end-a.start)*t[n]}},i._invertPoint=function(t){var e=this.transposed,i=e?"y":"x",n=e?"x":"y",r=this.x,a=this.y,s={};return s[i]=(t.x-r.start)/(r.end-r.start),s[n]=(t.y-a.start)/(a.end-a.start),s},e}(kt);function Dt(t,e){return g(e)?e:t.invert(t.scale(e))}kt.Cartesian=Tt,kt.Rect=Tt;var At=function(){function t(t){var e=this;this.type="base",this.name=null,this.method=null,this.values=[],this.scales=[],this.linear=null;var i=null,n=this.callback;if(t.callback){var r=t.callback;i=function(){for(var t=arguments.length,i=new Array(t),a=0;a<t;a++)i[a]=arguments[a];var o=r.apply(void 0,i);return s(o)&&(o=n.apply(e,i)),o}}T(this,t),i&&T(this,{callback:i})}var e=t.prototype;return e._getAttrValue=function(t,e){var i=this.values;if(t.isCategory&&!this.linear)return i[t.translate(e)%i.length];var n=t.scale(e);return this.getLinearValue(n)},e.getLinearValue=function(t){var e=this.values,i=e.length-1,n=Math.floor(i*t),r=i*t-n,a=e[n];return a+((n===i?a:e[n+1])-a)*r},e.callback=function(t){var e=this.scales[0];return"identity"===e.type?e.value:this._getAttrValue(e,t)},e.getNames=function(){for(var t=this.scales,e=this.names,i=Math.min(t.length,e.length),n=[],r=0;r<i;r++)n.push(e[r]);return n},e.getFields=function(){var t=this.scales,e=[];return u(t,(function(t){e.push(t.field)})),e},e.getScale=function(t){return this.scales[this.names.indexOf(t)]},e.mapping=function(){for(var t=this.scales,e=this.callback,i=arguments.length,n=new Array(i),r=0;r<i;r++)n[r]=arguments[r];var a=n;if(e){for(var s=0,o=n.length;s<o;s++)n[s]=this._toOriginParam(n[s],t[s]);a=e.apply(this,n)}return a=[].concat(a)},e._toOriginParam=function(t,e){var i=t;if(!e.isLinear)if(o(t)){i=[];for(var n=0,r=t.length;n<r;n++)i.push(Dt(e,t[n]))}else i=Dt(e,t);return i},t}(),It=function(t){function e(e){var i;return(i=t.call(this,e)||this).names=["x","y"],i.type="position",i}return xt(e,t),e.prototype.mapping=function(t,e){var i,n,r,a=this.scales,h=this.coord,l=a[0],c=a[1];if(s(t)||s(e))return[];if(o(e)&&o(t)){i=[],n=[];for(var f=0,g=0,p=t.length,d=e.length;f<p&&g<d;f++,g++)r=h.convertPoint({x:l.scale(t[f]),y:c.scale(e[g])}),i.push(r.x),n.push(r.y)}else if(o(e))t=l.scale(t),n=[],u(e,(function(e){e=c.scale(e),r=h.convertPoint({x:t,y:e}),i&&i!==r.x?(o(i)||(i=[i]),i.push(r.x)):i=r.x,n.push(r.y)}));else if(o(t))e=c.scale(e),i=[],u(t,(function(t){t=l.scale(t),r=h.convertPoint({x:t,y:e}),n&&n!==r.y?(o(n)||(n=[n]),n.push(r.y)):n=r.y,i.push(r.x)}));else{t=l.scale(t),e=c.scale(e);var v=h.convertPoint({x:t,y:e});i=v.x,n=v.y}return[i,n]},e}(At),Yt=function(t){function e(e){var i;return(i=t.call(this,e)||this).names=["shape"],i.type="shape",i.gradient=null,i}return xt(e,t),e.prototype.getLinearValue=function(t){var e=this.values;return e[Math.round((e.length-1)*t)]},e}(At),Ot=function(t){function e(e){var i;return(i=t.call(this,e)||this).names=["size"],i.type="size",i.gradient=null,i}return xt(e,t),e}(At);function Et(t,e,i,n){return t[n]+(e[n]-t[n])*i}function Nt(t){return"#"+Ft(t[0])+Ft(t[1])+Ft(t[2])}function Ft(t){return 1===(t=(t=Math.round(t)).toString(16)).length&&(t="0"+t),t}var zt={black:"#000000",blue:"#0000ff",grey:"#808080",green:"#008000",orange:"#ffa500",pink:"#ffc0cb",purple:"#800080",red:"#ff0000",white:"#ffffff",yellow:"#ffff00"};function Bt(t){var e=[];return g(t)&&(t=t.split("-")),u(t,(function(t){var i,n;-1===t.indexOf("#")&&(t=function(t){if(zt[t])return zt[t];if("#"===t[0]){if(7===t.length)return t;var e=t.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i,(function(t,e,i,n){return"#"+e+e+i+i+n+n}));return zt[t]=e,e}var i=t.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i);return i.shift(),i=Nt(i),zt[t]=i,i}(t)),e.push((i=t,(n=[]).push(parseInt(i.substr(1,2),16)),n.push(parseInt(i.substr(3,2),16)),n.push(parseInt(i.substr(5,2),16)),n))})),function(t){return function(t,e){var i=t.length-1,n=Math.floor(i*e),r=i*e-n,a=t[n],s=n===i?a:t[n+1];return Nt([Et(a,s,r,0),Et(a,s,r,1),Et(a,s,r,2)])}(e,t)}}var Xt=function(t){function e(e){var i;return(i=t.call(this,e)||this).names=["color"],i.type="color",i.gradient=null,g(i.values)&&(i.linear=!0),i}return xt(e,t),e.prototype.getLinearValue=function(t){var e=this.gradient;e||(e=Bt(this.values),this.gradient=e);return e(t)},e}(At),Lt=Object.freeze({__proto__:null,Position:It,Shape:Yt,Size:Ot,Color:Xt}),jt={},Gt={_coord:null,draw:function(t,e){this.drawShape&&this.drawShape(t,e)},setCoord:function(t){this._coord=t},parsePoint:function(t){var e=this._coord;return e.isPolar&&(1===t.x&&(t.x=.9999999),1===t.y&&(t.y=.9999999)),e.convertPoint(t)},parsePoints:function(t){if(!t)return!1;var e=this,i=[];return t.forEach((function(t){i.push(e.parsePoint(t))})),i}},Rt={defaultShapeType:null,setCoord:function(t){this._coord=t},getShape:function(t){o(t)&&(t=t[0]);var e=this[t]||this[this.defaultShapeType];return e._coord=this._coord,e},getShapePoints:function(t,e){var i=this.getShape(t);return(i.getPoints||i.getShapePoints||this.getDefaultPoints)(e)},getDefaultPoints:function(){return[]},drawShape:function(t,e,i){var n=this.getShape(t);return e.color||(e.color=vt.colors[0]),n.draw(e,i)}};function Ht(t,e){for(var i in e)e.hasOwnProperty(i)&&"constructor"!==i&&void 0!==e[i]&&(t[i]=e[i])}jt.registerFactory=function(t,e){var i=M(t),n=T({},Rt,e);return jt[i]=n,n.name=t,n},jt.registerShape=function(t,e,i){var n=M(t),r=jt[n],a=T({},Gt,i);return r[e]=a,a},jt.registShape=jt.registerShape,jt.getShapeFactory=function(t){return this[M(t=t||"point")]};var Wt=function(t,e,i,n){return e&&Ht(t,e),i&&Ht(t,i),n&&Ht(t,n),t},Vt=function(){var t=e.prototype;function e(t){this._initDefaultCfg(),Wt(this,t)}return t._initDefaultCfg=function(){this.adjustNames=["x","y"]},t.processAdjust=function(){},e}();function qt(t){var e=t.type,i=t.values;if("linear"===e)return S(dt.scale.linear,t);if("cat"===e)return S(dt.scale.cat,{values:i.slice(0,10).join(" ")});if("timeCat"===e){var n=t.getText(i[0]),r=t.getText(i[i.length-1]);return S(dt.scale.timeCat,{start:n,end:r})}return""}var Zt=["color","size","shape"];function Ut(t){return o(t)?t:g(t)?t.split("*"):[t]}var Jt=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i.getDefaultCfg=function(){return{type:null,data:null,attrs:{},scales:{},container:null,styleOptions:null,chart:null,shapeType:"",generatePoints:!1,attrOptions:{},sortable:!1,startOnZero:!0,visible:!0,connectNulls:!1,ignoreEmptyGroup:!1,isInit:!1}},i.init=function(){this.get("isInit")||(this._initAttrs(),this._processData(),this.set("isInit",!0))},i._getGroupScales=function(){var t=this,e=[];return u(Zt,(function(i){var n=t.getAttr(i);n&&u(n.scales,(function(t){t&&t.isCategory&&-1===e.indexOf(t)&&e.push(t)}))})),e},i._groupData=function(t){var e=this.get("colDefs"),i=this._getGroupScales();if(i.length){var n={},r=[];return u(i,(function(t){var i=t.field;r.push(i),e&&e[i]&&e[i].values&&(n[t.field]=e[i].values)})),j(t,r,n)}return[t]},i._setAttrOptions=function(t,e){this.get("attrOptions")[t]=e;var i=this.get("attrs");Object.keys(i).length&&this._createAttr(t,e)},i._createAttrOption=function(t,e,i,n){var r={};r.field=e,i?a(i)?r.callback=i:r.values=i:r.values=n,this._setAttrOptions(t,r)},i._createAttr=function(t,e){var i=this.get("attrs"),n=this.get("coord"),r=M(t),a=Ut(e.field);"position"===t&&(e.coord=n);for(var s=[],o=0,h=a.length;o<h;o++){var u=a[o],l=this._createScale(u);s.push(l)}if("position"===t){var c=s[1];"polar"===n.type&&n.transposed&&this.hasAdjust("stack")&&c.values.length&&c.change({nice:!1,min:0,max:Math.max.apply(null,c.values)})}e.scales=s;var f=new Lt[r](e);return i[t]=f,f},i._initAttrs=function(){var t=this.get("attrOptions");for(var e in t)t.hasOwnProperty(e)&&this._createAttr(e,t[e])},i._createScale=function(t){var e=this.get("scales"),i=e[t];return i||(i=this.get("chart").createScale(t),e[t]=i),i},i._processData=function(){var t=this.get("data"),e=[],i=this._groupData(t);if(this.get("ignoreEmptyGroup")){var n=this.getYScale();i=i.filter((function(t){return t.some((function(t){return void 0!==t[n.field]}))}))}for(var r=0,a=i.length;r<a;r++){var s=i[r],o=this._saveOrigin(s);this.hasAdjust("dodge")&&this._numberic(o),e.push(o)}return this.get("adjust")&&this._adjustData(e),this.get("sortable")&&this._sort(e),this.emit("afterprocessdata",{dataArray:e}),this.set("mappingData",e),this.set("dataArray",e),e},i._saveOrigin=function(t){for(var e=[],i=0,n=t.length;i<n;i++){var r=t[i],a={};for(var s in r)a[s]=r[s];a._origin=r,e.push(a)}return e},i._numberic=function(t){for(var e=this.getAttr("position").scales,i=0,n=t.length;i<n;i++)for(var r=t[i],a=Math.min(2,e.length),s=0;s<a;s++){var o=e[s];if(o.isCategory){var h=o.field;r[h]=o.translate(r[h])}}},i._adjustData=function(t){var e=this.get("adjust");if(e){var i=M(e.type);if(!Vt[i])throw new Error("not support such adjust : "+e);var n=this.getXScale(),r=this.getYScale(),a=T({xField:n.field,yField:r.field},e);new Vt[i](a).processAdjust(t),"Stack"===i&&this._updateStackRange(r.field,r,t)}},i._updateStackRange=function(t,e,i){for(var n=z(i),r=e.min,a=e.max,s=0,o=n.length;s<o;s++){var h=n[s],u=Math.min.apply(null,h[t]),l=Math.max.apply(null,h[t]);u<r&&(r=u),l>a&&(a=l)}(r<e.min||a>e.max)&&e.change({min:r,max:a})},i._sort=function(t){var e=this.getXScale(),i=e.field,n=e.type;"identity"!==n&&e.values.length>1&&u(t,(function(t){t.sort((function(t,r){return"timeCat"===n?ct(t._origin[i])-ct(r._origin[i]):e.translate(t._origin[i])-e.translate(r._origin[i])}))})),this.set("hasSorted",!0),this.set("dataArray",t)},i.paint=function(){var t=this.get("mappingData"),e=[],i=this.getShapeFactory();i.setCoord(this.get("coord")),this._beforeMapping(t);for(var n=0,r=t.length;n<r;n++){var a=t[n];if(a.length){var s=this._mapping(a);e.push(s),this.draw(s,i)}}this.set("dataArray",e),this.generateAria()},i.getShapeFactory=function(){var t=this.get("shapeFactory");if(!t){var e=this.get("shapeType");t=jt.getShapeFactory(e),this.set("shapeFactory",t)}return t},i._mapping=function(t){var e=this.get("attrs"),i=this.getYScale().field,n={},r=new Array(t.length);for(var a in e)if(e.hasOwnProperty(a))for(var s=e[a],h=s.names,u=s.scales,l=0,c=t.length;l<c;l++){var f=t[l],g=mt({},f,r[l]);if(g._originY=f[i],"position"===s.type)for(var p=this._getAttrValues(s,f),d=0,v=p.length;d<v;d++){var y=p[d];g[h[d]]=o(y)&&1===y.length?y[0]:y}else{var m=h[0],x=""+m+f[u[0].field],_=n[x];_||(_=this._getAttrValues(s,f),n[x]=_),g[m]=_[0]}r[l]=g}return r},i._getAttrValues=function(t,e){for(var i=t.scales,n=[],r=0,a=i.length;r<a;r++){var s=i[r],o=s.field;"identity"===s.type?n.push(s.value):n.push(e[o])}return t.mapping.apply(t,n)},i.getAttrValue=function(t,e){var i=this.getAttr(t),n=null;i&&(n=this._getAttrValues(i,e)[0]);return n},i._beforeMapping=function(t){this.get("generatePoints")&&this._generatePoints(t)},i.isInCircle=function(){var t=this.get("coord");return t&&t.isPolar},i.getCallbackCfg=function(t,e,i){if(!t)return e;var n={},r=t.map((function(t){return i[t]}));return u(e,(function(t,e){a(t)?n[e]=t.apply(null,r):n[e]=t})),n},i.getDrawCfg=function(t){var e=this.isInCircle(),i={origin:t,x:t.x,y:t.y,color:t.color,size:t.size,shape:t.shape,isInCircle:e,opacity:t.opacity},n=this.get("styleOptions");return n&&n.style&&(i.style=this.getCallbackCfg(n.fields,n.style,t._origin)),this.get("generatePoints")&&(i.points=t.points,i.nextPoints=t.nextPoints),e&&(i.center=this.get("coord").center),i},i.draw=function(t,e){var i=this,n=i.get("container"),r=i.getYScale();u(t,(function(t,a){if(!r||!s(t._origin[r.field])){t.index=a;var o=i.getDrawCfg(t),h=t.shape;i.drawShape(h,t,o,n,e)}}))},i.drawShape=function(t,e,i,n,r){var a=r.drawShape(t,i,n);a&&u([].concat(a),(function(t){t.set("origin",e)}))},i._generatePoints=function(t){var e=this,i=e.getShapeFactory(),n=e.getAttr("shape");u(t,(function(t){for(var r=0,a=t.length;r<a;r++){var s=t[r],o=e.createShapePointsCfg(s),h=n?e._getAttrValues(n,s):null,u=i.getShapePoints(h,o);s.points=u}})),u(t,(function(e,i){var n=t[i+1];n&&(e[0].nextPoints=n[0].points)}))},i.generateAria=function(){var t=this.get("container");if(t.get("aria")){var e=[],i=this.get("coord"),n=this.getXScale(),r=this.getYScale(),a=function(t,e,i){var n=t.type;return dt.coord[n]?S(dt.coord[n],{xLabel:qt(e),yLabel:qt(i)}):""}(i,n,r);e.push(a);var s=dt.geometry,o=s.prefix,h=s.oneData,l=s.partData,c=s.allData,f=this.get("dataArray"),g=f.length,p=this._getGroupScales()[0];if(p){var d=S(o,{count:g});e.push(d),u(f,(function(t,i){var a=t.length;if(a){var s=t[0]._origin;if(1===a)e.push(S(h,{index:i+1,count:a,name:s[p.field],values:s[r.field]}));else{var o=a>5?l:c,u=t.slice(0,5).map((function(t){var e=t._origin;return n.getText(e[n.field])+":"+r.getText(e[r.field])}));e.push(S(o,{index:i+1,count:a,part:3,name:s[p.field],values:u.join(" ")}))}}}))}t.set("ariaLabel",e.join(""))}},i.createShapePointsCfg=function(t){var e=this.getXScale(),i=this.getYScale();return{x:this._normalizeValues(t[e.field],e),y:i?this._normalizeValues(t[i.field],i):t.y?t.y:.1,y0:i?i.scale(this.getYMinValue()):void 0}},i.getYMinValue=function(){var t=this.getYScale(),e=t.min,i=t.max;return this.get("startOnZero")?i<=0&&e<=0?i:e>=0?e:0:e},i._normalizeValues=function(t,e){var i=[];if(o(t))for(var n=0,r=t.length;n<r;n++){var a=t[n];i.push(e.scale(a))}else i=e.scale(t);return i},i.getAttr=function(t){return this.get("attrs")[t]},i.getXScale=function(){return this.getAttr("position").scales[0]},i.getYScale=function(){return this.getAttr("position").scales[1]},i.hasAdjust=function(t){return this.get("adjust")&&this.get("adjust").type===t},i._getSnap=function(t,e,i){var n,r=0,a=this.getYScale().field;if(this.hasAdjust("stack")&&t.field===a){n=[],i.forEach((function(t){n.push(t._originY)}));for(var s=n.length;r<s&&!(n[0][0]>e);r++){if(n[n.length-1][1]<=e){r=n.length-1;break}if(n[r][0]<=e&&n[r][1]>e)break}}else{(n=t.values).sort((function(t,e){return t-e}));for(var o=n.length;r<o&&!(o<=1)&&!((n[0]+n[1])/2>e)&&!((n[r-1]+n[r])/2<=e&&(n[r+1]+n[r])/2>e);r++)if((n[n.length-2]+n[n.length-1])/2<=e){r=n.length-1;break}}return n[r]},i.getSnapRecords=function(t){var e=this,i=e.get("coord"),n=e.getXScale(),r=e.getYScale(),a=n.field,h=e.get("dataArray");this.get("hasSorted")||this._sort(h);var u=[],l=i.invertPoint(t),c=l.x;e.isInCircle()&&!i.transposed&&c>(1+n.rangeMax())/2&&(c=n.rangeMin());var f=n.invert(c);n.isCategory||(f=e._getSnap(n,f));var g=[];if(h.forEach((function(t){t.forEach((function(t){var i=s(t._origin)?t[a]:t._origin[a];e._isEqual(i,f,n)&&g.push(t)}))})),this.hasAdjust("stack")&&i.isPolar&&i.transposed){if(c>=0&&c<=1){var p=r.invert(l.y);p=e._getSnap(r,p,g),g.forEach((function(t){(o(p)?t._originY.toString()===p.toString():t._originY===p)&&u.push(t)}))}}else u=g;return u},i.getRecords=function(t){var e=this,i=this.getXScale(),n=this.get("dataArray"),r=i.field;return n.map((function(n){for(var a=n.length-1;a>=0;a--){var o=n[a],h=s(o._origin)?o[r]:o._origin[r];if(e._isEqual(h,t,i))return o}return null}))},i._isEqual=function(t,e,i){return"timeCat"===i.type?ct(t)===e:e===t},i.position=function(t){return this._setAttrOptions("position",{field:t}),this},i.color=function(t,e){return this._createAttrOption("color",t,e,vt.colors),this},i.size=function(t,e){return this._createAttrOption("size",t,e,vt.sizes),this},i.shape=function(t,e){var i=this.get("type"),n=vt.shapes[i]||[];return this._createAttrOption("shape",t,e,n),this},i.style=function(t,e){var i,n=this.get("styleOptions");return n||(n={},this.set("styleOptions",n)),h(t)&&(e=t,t=null),t&&(i=Ut(t)),n.fields=i,n.style=e,this},i.adjust=function(t){return g(t)&&(t={type:t}),this.set("adjust",t),this},i.animate=function(t){return this.set("animateCfg",t),this},i.changeData=function(t){this.set("data",t),this.set("scales",{}),this.get("isInit")&&(this.set("isInit",!1),this.init())},i.clearInner=function(){var t=this.get("container");t&&t.clear()},i.reset=function(){this.set("isInit",!1),this.set("attrs",{}),this.set("attrOptions",{}),this.set("adjust",null),this.clearInner()},i.clear=function(){this.clearInner()},i.destroy=function(){this.set("isInit",!1),this.clear(),t.prototype.destroy.call(this)},i._display=function(t){this.set("visible",t);var e=this.get("container"),i=e.get("canvas");e.set("visible",t),i.draw()},i.show=function(){this._display(!0)},i.hide=function(){this._display(!1)},e}(Mt),$t={};function Kt(t){return $t[t]}function Qt(t,e){$t[t]=e}var te=function(){function t(t){this.type="base",this.isCategory=!1,this.isLinear=!1,this.isContinuous=!1,this.isIdentity=!1,this.values=[],this.range=[0,1],this.ticks=[],this.__cfg__=t,this.initCfg(),this.init()}return t.prototype.translate=function(t){return t},t.prototype.change=function(t){T(this.__cfg__,t),this.init()},t.prototype.clone=function(){return this.constructor(this.__cfg__)},t.prototype.getTicks=function(){var t=this;return N(this.ticks,(function(e,i){return h(e)?e:{text:t.getText(e,i),tickValue:e,value:t.scale(e)}}))},t.prototype.getText=function(t,e){var i=this.formatter,n=i?i(t,e):t;return s(n)||!a(n.toString)?"":n.toString()},t.prototype.getConfig=function(t){return this.__cfg__[t]},t.prototype.init=function(){T(this,this.__cfg__),this.setDomain(),O(this.getConfig("ticks"))&&(this.ticks=this.calculateTicks())},t.prototype.initCfg=function(){},t.prototype.setDomain=function(){},t.prototype.calculateTicks=function(){var t=this.tickMethod,e=[];if(g(t)){var i=Kt(t);if(!i)throw new Error("There is no method to to calculate ticks!");e=i(this)}else a(t)&&(e=t(this));return e},t.prototype.rangeMin=function(){return d(this.range)},t.prototype.rangeMax=function(){return v(this.range)},t.prototype.calcPercent=function(t,e,i){return m(t)?(t-e)/(i-e):NaN},t.prototype.calcValue=function(t,e,i){return e+t*(i-e)},t}(),ee=function(t,e){return(ee=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var i in e)Object.prototype.hasOwnProperty.call(e,i)&&(t[i]=e[i])})(t,e)};
+/*! *****************************************************************************
+    Copyright (c) Microsoft Corporation.
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose with or without fee is hereby granted.
+
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
+    ***************************************************************************** */function ie(t,e){function i(){this.constructor=t}ee(t,e),t.prototype=null===e?Object.create(e):(i.prototype=e.prototype,new i)}function ne(){for(var t=0,e=0,i=arguments.length;e<i;e++)t+=arguments[e].length;var n=Array(t),r=0;for(e=0;e<i;e++)for(var a=arguments[e],s=0,o=a.length;s<o;s++,r++)n[r]=a[s];return n}var re=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="cat",e.isCategory=!0,e}return ie(e,t),e.prototype.translate=function(t){var e=I(this.values,t);return-1===e?m(t)?t:NaN:e},e.prototype.scale=function(t){var e=this.translate(t),i=this.calcPercent(e,this.min,this.max);return this.calcValue(i,this.rangeMin(),this.rangeMax())},e.prototype.invert=function(t){var e=this.max-this.min,i=this.calcPercent(t,this.rangeMin(),this.rangeMax()),n=Math.round(e*i)+this.min;return n<this.min||n>this.max?NaN:this.values[n]},e.prototype.getText=function(e){for(var i=[],n=1;n<arguments.length;n++)i[n-1]=arguments[n];var r=e;return m(e)&&!this.values.includes(e)&&(r=this.values[r]),t.prototype.getText.apply(this,ne([r],i))},e.prototype.initCfg=function(){this.tickMethod="cat"},e.prototype.setDomain=function(){if(s(this.getConfig("min"))&&(this.min=0),s(this.getConfig("max"))){var t=this.values.length;this.max=t>1?t-1:t}},e}(te),ae=/d{1,4}|M{1,4}|YY(?:YY)?|S{1,3}|Do|ZZ|Z|([HhMsDm])\1?|[aA]|"[^"]*"|'[^']*'/g,se="[^\\s]+",oe=/\[([^]*?)\]/gm;function he(t,e){for(var i=[],n=0,r=t.length;n<r;n++)i.push(t[n].substr(0,e));return i}var ue=function(t){return function(e,i){var n=i[t].map((function(t){return t.toLowerCase()})).indexOf(e.toLowerCase());return n>-1?n:null}};function le(t){for(var e=[],i=1;i<arguments.length;i++)e[i-1]=arguments[i];for(var n=0,r=e;n<r.length;n++){var a=r[n];for(var s in a)t[s]=a[s]}return t}var ce=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],fe=["January","February","March","April","May","June","July","August","September","October","November","December"],ge=he(fe,3),pe={dayNamesShort:he(ce,3),dayNames:ce,monthNamesShort:ge,monthNames:fe,amPm:["am","pm"],DoFn:function(t){return t+["th","st","nd","rd"][t%10>3?0:(t-t%10!=10?1:0)*t%10]}},de=le({},pe),ve=function(t){return de=le(de,t)},ye=function(t){return t.replace(/[|\\{()[^$+*?.-]/g,"\\$&")},me=function(t,e){for(void 0===e&&(e=2),t=String(t);t.length<e;)t="0"+t;return t},xe={D:function(t){return String(t.getDate())},DD:function(t){return me(t.getDate())},Do:function(t,e){return e.DoFn(t.getDate())},d:function(t){return String(t.getDay())},dd:function(t){return me(t.getDay())},ddd:function(t,e){return e.dayNamesShort[t.getDay()]},dddd:function(t,e){return e.dayNames[t.getDay()]},M:function(t){return String(t.getMonth()+1)},MM:function(t){return me(t.getMonth()+1)},MMM:function(t,e){return e.monthNamesShort[t.getMonth()]},MMMM:function(t,e){return e.monthNames[t.getMonth()]},YY:function(t){return me(String(t.getFullYear()),4).substr(2)},YYYY:function(t){return me(t.getFullYear(),4)},h:function(t){return String(t.getHours()%12||12)},hh:function(t){return me(t.getHours()%12||12)},H:function(t){return String(t.getHours())},HH:function(t){return me(t.getHours())},m:function(t){return String(t.getMinutes())},mm:function(t){return me(t.getMinutes())},s:function(t){return String(t.getSeconds())},ss:function(t){return me(t.getSeconds())},S:function(t){return String(Math.round(t.getMilliseconds()/100))},SS:function(t){return me(Math.round(t.getMilliseconds()/10),2)},SSS:function(t){return me(t.getMilliseconds(),3)},a:function(t,e){return t.getHours()<12?e.amPm[0]:e.amPm[1]},A:function(t,e){return t.getHours()<12?e.amPm[0].toUpperCase():e.amPm[1].toUpperCase()},ZZ:function(t){var e=t.getTimezoneOffset();return(e>0?"-":"+")+me(100*Math.floor(Math.abs(e)/60)+Math.abs(e)%60,4)},Z:function(t){var e=t.getTimezoneOffset();return(e>0?"-":"+")+me(Math.floor(Math.abs(e)/60),2)+":"+me(Math.abs(e)%60,2)}},_e=function(t){return+t-1},Se=[null,"[1-9]\\d?"],Me=[null,se],we=["isPm",se,function(t,e){var i=t.toLowerCase();return i===e.amPm[0]?0:i===e.amPm[1]?1:null}],be=["timezoneOffset","[^\\s]*?[\\+\\-]\\d\\d:?\\d\\d|[^\\s]*?Z?",function(t){var e=(t+"").match(/([+-]|\d\d)/gi);if(e){var i=60*+e[1]+parseInt(e[2],10);return"+"===e[0]?i:-i}return 0}],Ce={D:["day","[1-9]\\d?"],DD:["day","\\d\\d"],Do:["day","[1-9]\\d?"+se,function(t){return parseInt(t,10)}],M:["month","[1-9]\\d?",_e],MM:["month","\\d\\d",_e],YY:["year","\\d\\d",function(t){var e=+(""+(new Date).getFullYear()).substr(0,2);return+(""+(+t>68?e-1:e)+t)}],h:["hour","[1-9]\\d?",void 0,"isPm"],hh:["hour","\\d\\d",void 0,"isPm"],H:["hour","[1-9]\\d?"],HH:["hour","\\d\\d"],m:["minute","[1-9]\\d?"],mm:["minute","\\d\\d"],s:["second","[1-9]\\d?"],ss:["second","\\d\\d"],YYYY:["year","\\d{4}"],S:["millisecond","\\d",function(t){return 100*+t}],SS:["millisecond","\\d\\d",function(t){return 10*+t}],SSS:["millisecond","\\d{3}"],d:Se,dd:Se,ddd:Me,dddd:Me,MMM:["month",se,ue("monthNamesShort")],MMMM:["month",se,ue("monthNames")],a:we,A:we,ZZ:be,Z:be},Pe={default:"ddd MMM DD YYYY HH:mm:ss",shortDate:"M/D/YY",mediumDate:"MMM D, YYYY",longDate:"MMMM D, YYYY",fullDate:"dddd, MMMM D, YYYY",isoDate:"YYYY-MM-DD",isoDateTime:"YYYY-MM-DDTHH:mm:ssZ",shortTime:"HH:mm",mediumTime:"HH:mm:ss",longTime:"HH:mm:ss.SSS"},ke=function(t){return le(Pe,t)},Te=function(t,e,i){if(void 0===e&&(e=Pe.default),void 0===i&&(i={}),"number"==typeof t&&(t=new Date(t)),"[object Date]"!==Object.prototype.toString.call(t)||isNaN(t.getTime()))throw new Error("Invalid Date pass to format");var n=[];e=(e=Pe[e]||e).replace(oe,(function(t,e){return n.push(e),"@@@"}));var r=le(le({},de),i);return(e=e.replace(ae,(function(e){return xe[e](t,r)}))).replace(/@@@/g,(function(){return n.shift()}))};function De(t,e,i){if(void 0===i&&(i={}),"string"!=typeof e)throw new Error("Invalid format in fecha parse");if(e=Pe[e]||e,t.length>1e3)return null;var n={year:(new Date).getFullYear(),month:0,day:1,hour:0,minute:0,second:0,millisecond:0,isPm:null,timezoneOffset:null},r=[],a=[],s=e.replace(oe,(function(t,e){return a.push(ye(e)),"@@@"})),o={},h={};s=ye(s).replace(ae,(function(t){var e=Ce[t],i=e[0],n=e[1],a=e[3];if(o[i])throw new Error("Invalid format. "+i+" specified twice in format");return o[i]=!0,a&&(h[a]=!0),r.push(e),"("+n+")"})),Object.keys(h).forEach((function(t){if(!o[t])throw new Error("Invalid format. "+t+" is required in specified format")})),s=s.replace(/@@@/g,(function(){return a.shift()}));var u=t.match(new RegExp(s,"i"));if(!u)return null;for(var l=le(le({},de),i),c=1;c<u.length;c++){var f=r[c-1],g=f[0],p=f[2],d=p?p(u[c],l):+u[c];if(null==d)return null;n[g]=d}1===n.isPm&&null!=n.hour&&12!=+n.hour?n.hour=+n.hour+12:0===n.isPm&&12==+n.hour&&(n.hour=0);for(var v=new Date(n.year,n.month,n.day,n.hour,n.minute,n.second,n.millisecond),y=[["month","getMonth"],["day","getDate"],["hour","getHours"],["minute","getMinutes"],["second","getSeconds"]],m=(c=0,y.length);c<m;c++)if(o[y[c][0]]&&n[y[c][0]]!==v[y[c][1]]())return null;return null==n.timezoneOffset?v:new Date(Date.UTC(n.year,n.month,n.day,n.hour,n.minute-n.timezoneOffset,n.second,n.millisecond))}var Ae={format:Te,parse:De,defaultI18n:pe,setGlobalDateI18n:ve,setGlobalDateMasks:ke},Ie=Object.freeze({__proto__:null,default:Ae,assign:le,format:Te,parse:De,defaultI18n:pe,setGlobalDateI18n:ve,setGlobalDateMasks:ke});function Ye(t,e){return(Ie.format||Ae.format)(t,e)}function Oe(t){return g(t)&&(t=t.indexOf("T")>0?new Date(t).getTime():new Date(t.replace(/-/gi,"/")).getTime()),C(t)&&(t=t.getTime()),t}var Ee=36e5,Ne=24*Ee,Fe=31*Ne,ze=[["HH:mm:ss",1e3],["HH:mm:ss",1e4],["HH:mm:ss",3e4],["HH:mm",6e4],["HH:mm",6e5],["HH:mm",18e5],["HH",Ee],["HH",6*Ee],["HH",12*Ee],["YYYY-MM-DD",Ne],["YYYY-MM-DD",4*Ne],["YYYY-WW",7*Ne],["YYYY-MM",Fe],["YYYY-MM",4*Fe],["YYYY-MM",6*Fe],["YYYY",380*Ne]];function Be(t,e,i){var n,r=(n=function(t){return t[1]},function(t,e,i,r){for(var a=s(i)?0:i,o=s(r)?t.length:r;a<o;){var h=a+o>>>1;n(t[h])>e?o=h:a=h+1}return a})(ze,(e-t)/i)-1,a=ze[r];return r<0?a=ze[0]:r>=ze.length&&(a=v(ze)),a}var Xe=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="timeCat",e}return ie(e,t),e.prototype.translate=function(t){t=Oe(t);var e=this.values.indexOf(t);return-1===e&&(e=m(t)&&t<this.values.length?t:NaN),e},e.prototype.getText=function(t,e){var i=this.translate(t);if(i>-1){var n=this.values[i],r=this.formatter;return n=r?r(n,e):Ye(n,this.mask)}return t},e.prototype.initCfg=function(){this.tickMethod="time-cat",this.mask="YYYY-MM-DD",this.tickCount=7},e.prototype.setDomain=function(){var e=this.values;u(e,(function(t,i){e[i]=Oe(t)})),e.sort((function(t,e){return t-e})),t.prototype.setDomain.call(this)},e}(re),Le=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.isContinuous=!0,e}return ie(e,t),e.prototype.scale=function(t){if(s(t))return NaN;var e=this.rangeMin(),i=this.rangeMax();return this.max===this.min?e:e+this.getScalePercent(t)*(i-e)},e.prototype.init=function(){t.prototype.init.call(this);var e=this.ticks,i=d(e),n=v(e);i<this.min&&(this.min=i),n>this.max&&(this.max=n),s(this.minLimit)||(this.min=i),s(this.maxLimit)||(this.max=n)},e.prototype.setDomain=function(){var t=function(t){var e=t.filter((function(t){return!isNaN(t)}));if(!e.length)return{min:0,max:0};if(o(t[0])){for(var i=[],n=0;n<t.length;n++)i=i.concat(t[n]);e=i}var r=Math.max.apply(null,e);return{min:Math.min.apply(null,e),max:r}}(this.values),e=t.min,i=t.max;s(this.min)&&(this.min=e),s(this.max)&&(this.max=i),this.min>this.max&&(this.min=e,this.max=i)},e.prototype.calculateTicks=function(){var e=this,n=t.prototype.calculateTicks.call(this);return this.nice||(n=i(n,(function(t){return t>=e.min&&t<=e.max}))),n},e.prototype.getScalePercent=function(t){var e=this.max,i=this.min;return(t-i)/(e-i)},e.prototype.getInvertPercent=function(t){return(t-this.rangeMin())/(this.rangeMax()-this.rangeMin())},e}(te),je=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="linear",e.isLinear=!0,e}return ie(e,t),e.prototype.invert=function(t){var e=this.getInvertPercent(t);return this.min+e*(this.max-this.min)},e.prototype.initCfg=function(){this.tickMethod="wilkinson-extended",this.nice=!1},e}(Le);function Ge(t,e){var i=Math.E;return e>=0?Math.pow(i,Math.log(e)/t):-1*Math.pow(i,Math.log(-e)/t)}function Re(t,e){return 1===t?1:Math.log(e)/Math.log(t)}function He(t,e,i){s(i)&&(i=Math.max.apply(null,t));var n=i;return u(t,(function(t){t>0&&t<n&&(n=t)})),n===i&&(n=i/e),n>1&&(n=1),n}var We=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="log",e}return ie(e,t),e.prototype.invert=function(t){var e,i=this.base,n=Re(i,this.max),r=this.rangeMin(),a=this.rangeMax()-r,s=this.positiveMin;if(s){if(0===t)return 0;var o=1/(n-(e=Re(i,s/i)))*a;if(t<o)return t/o*s}else e=Re(i,this.min);var h=(t-r)/a*(n-e)+e;return Math.pow(i,h)},e.prototype.initCfg=function(){this.tickMethod="log",this.base=10,this.tickCount=6,this.nice=!0},e.prototype.setDomain=function(){t.prototype.setDomain.call(this);var e=this.min;if(e<0)throw new Error("When you use log scale, the minimum value must be greater than zero!");0===e&&(this.positiveMin=He(this.values,this.base,this.max))},e.prototype.getScalePercent=function(t){var e=this.max,i=this.min;if(e===i)return 0;if(t<=0)return 0;var n=this.base,r=this.positiveMin;return r&&(i=1*r/n),t<r?t/r/(Re(n,e)-Re(n,i)):(Re(n,t)-Re(n,i))/(Re(n,e)-Re(n,i))},e}(Le),Ve=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="pow",e}return ie(e,t),e.prototype.invert=function(t){var e=this.getInvertPercent(t),i=this.exponent,n=Ge(i,this.max),r=Ge(i,this.min),a=e*(n-r)+r,s=a>=0?1:-1;return Math.pow(a,i)*s},e.prototype.initCfg=function(){this.tickMethod="pow",this.exponent=2,this.tickCount=5,this.nice=!0},e.prototype.getScalePercent=function(t){var e=this.max,i=this.min;if(e===i)return 0;var n=this.exponent;return(Ge(n,t)-Ge(n,i))/(Ge(n,e)-Ge(n,i))},e}(Le),qe=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="time",e}return ie(e,t),e.prototype.getText=function(t,e){var i=this.translate(t),n=this.formatter;return n?n(i,e):Ye(i,this.mask)},e.prototype.scale=function(e){var i=e;return(g(i)||C(i))&&(i=this.translate(i)),t.prototype.scale.call(this,i)},e.prototype.translate=function(t){return Oe(t)},e.prototype.initCfg=function(){this.tickMethod="time-pretty",this.mask="YYYY-MM-DD",this.tickCount=7,this.nice=!1},e.prototype.setDomain=function(){var t=this.values,e=this.getConfig("min"),i=this.getConfig("max");if(s(e)&&m(e)||(this.min=this.translate(this.min)),s(i)&&m(i)||(this.max=this.translate(this.max)),t&&t.length){var n=[],r=1/0,a=r,o=0;u(t,(function(t){var e=Oe(t);if(isNaN(e))throw new TypeError("Invalid Time: "+t+" in time scale!");r>e?(a=r,r=e):a>e&&(a=e),o<e&&(o=e),n.push(e)})),t.length>1&&(this.minTickInterval=a-r),s(e)&&(this.min=r),s(i)&&(this.max=o)}},e}(je),Ze=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="quantize",e}return ie(e,t),e.prototype.invert=function(t){var e=this.ticks,i=e.length,n=this.getInvertPercent(t),r=Math.floor(n*(i-1));if(r>=i-1)return v(e);if(r<0)return d(e);var a=e[r],s=r/(i-1);return a+(n-s)/((r+1)/(i-1)-s)*(e[r+1]-a)},e.prototype.initCfg=function(){this.tickMethod="r-pretty",this.tickCount=5,this.nice=!0},e.prototype.calculateTicks=function(){var e=t.prototype.calculateTicks.call(this);return this.nice||(v(e)!==this.max&&e.push(this.max),d(e)!==this.min&&e.unshift(this.min)),e},e.prototype.getScalePercent=function(t){var e=this.ticks;if(t<d(e))return 0;if(t>v(e))return 1;var i=0;return u(e,(function(e,n){if(!(t>=e))return!1;i=n})),i/(e.length-1)},e}(Le),Ue=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="quantile",e}return ie(e,t),e.prototype.initCfg=function(){this.tickMethod="quantile",this.tickCount=5,this.nice=!0},e}(Ze),Je={};function $e(t){return Je[t]}function Ke(t,e){if($e(t))throw new Error("type '"+t+"' existed.");Je[t]=e}var Qe=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e.type="identity",e.isIdentity=!0,e}return ie(e,t),e.prototype.calculateTicks=function(){return this.values},e.prototype.scale=function(t){return this.values[0]!==t&&m(t)?t:this.range[0]},e.prototype.invert=function(t){var e=this.range;return t<e[0]||t>e[1]?NaN:this.values[0]},e}(te),ti=[1,5,2,2.5,4,3],ei=100*Number.EPSILON;function ii(t,e,i,n,r,a){var s=F(e),o=I(e,t),h=0,u=function(t,e){return(t%e+e)%e}(n,a);return(u<ei||a-u<ei)&&n<=0&&r>=0&&(h=1),1-o/(s-1)-i+h}function ni(t,e,i){var n=F(e);return 1-I(e,t)/(n-1)-i+1}function ri(t,e,i,n,r,a){var s=(t-1)/(a-r),o=(e-1)/(Math.max(a,n)-Math.min(i,r));return 2-Math.max(s/o,o/s)}function ai(t,e){return t>=e?2-(t-1)/(e-1):1}function si(t,e,i,n){var r=e-t;return 1-.5*(Math.pow(e-n,2)+Math.pow(t-i,2))/Math.pow(.1*r,2)}function oi(t,e,i){var n=e-t;if(i>n){var r=(i-n)/2;return 1-Math.pow(r,2)/Math.pow(.1*n,2)}return 1}function hi(t,e,i,n,r,a){if(void 0===i&&(i=5),void 0===n&&(n=!0),void 0===r&&(r=ti),void 0===a&&(a=[.25,.2,.5,.05]),"number"!=typeof t||"number"!=typeof e)return{min:0,max:0,ticks:[]};if(t===e||1===i)return{min:t,max:e,ticks:[t]};for(var s={score:-2,lmin:0,lmax:0,lstep:0},o=1;o<1/0;){for(var h=0,u=r;h<u.length;h++){var l=u[h],c=ni(l,r,o);if(Number.isNaN(c))throw new Error("NaN");if(a[0]*c+a[1]+a[2]+a[3]<s.score){o=1/0;break}for(var f=2;f<1/0;){var g=ai(f,i);if(a[0]*c+a[1]+a[2]*g+a[3]<s.score)break;for(var p=(e-t)/(f+1)/o/l,y=Math.ceil(Math.log10(p));y<1/0;){var m=o*l*Math.pow(10,y),x=oi(t,e,m*(f-1));if(a[0]*c+a[1]*x+a[2]*g+a[3]<s.score)break;var _=Math.floor(e/m)*o-(f-1)*o,S=Math.ceil(t/m)*o;if(_>S)y+=1;else{for(var M=_;M<=S;M+=1){var w=M*(m/o),b=w+m*(f-1),C=m,P=ii(l,r,o,w,b,C),k=si(t,e,w,b),T=ri(f,i,t,e,w,b),D=a[0]*P+a[1]*k+a[2]*T+1*a[3];D>s.score&&(!n||w<=t&&b>=e)&&(s.lmin=w,s.lmax=b,s.lstep=C,s.score=D)}y+=1}}f+=1}}o+=1}for(var A=Number.isInteger(s.lstep)?0:Math.ceil(Math.abs(Math.log10(s.lstep))),I=[],Y=s.lmin;Y<=s.lmax;Y+=s.lstep)I.push(Y);var O=A?N(I,(function(t){return Number.parseFloat(t.toFixed(A))})):I;return{min:Math.min(t,d(O)),max:Math.max(e,v(O)),ticks:O}}function ui(t){var e=t.values,n=t.tickInterval,r=t.tickCount,a=e;if(m(n))return i(a,(function(t,e){return e%n==0}));var o=t.min,h=t.max;if(s(o)&&(o=0),s(h)&&(h=e.length-1),m(r)&&r<h-o){var u=hi(o,h,r,!1,[1,2,5,3,4,7,6,8,9]).ticks;return i(u,(function(t){return t>=o&&t<=h})).map((function(t){return e[t]}))}return e.slice(o,h+1)}var li=Math.sqrt(50),ci=Math.sqrt(10),fi=Math.sqrt(2),gi=function(){function t(){this._domain=[0,1]}return t.prototype.domain=function(t){return t?(this._domain=Array.from(t,Number),this):this._domain.slice()},t.prototype.nice=function(t){var e,i;void 0===t&&(t=5);var n,r=this._domain.slice(),a=0,s=this._domain.length-1,o=this._domain[a],h=this._domain[s];return h<o&&(o=(e=[h,o])[0],h=e[1],a=(i=[s,a])[0],s=i[1]),(n=pi(o,h,t))>0?n=pi(o=Math.floor(o/n)*n,h=Math.ceil(h/n)*n,t):n<0&&(n=pi(o=Math.ceil(o*n)/n,h=Math.floor(h*n)/n,t)),n>0?(r[a]=Math.floor(o/n)*n,r[s]=Math.ceil(h/n)*n,this.domain(r)):n<0&&(r[a]=Math.ceil(o*n)/n,r[s]=Math.floor(h*n)/n,this.domain(r)),this},t.prototype.ticks=function(t){return void 0===t&&(t=5),function(t,e,i){var n,r,a,s,o=-1;if(i=+i,(t=+t)===(e=+e)&&i>0)return[t];(n=e<t)&&(r=t,t=e,e=r);if(0===(s=pi(t,e,i))||!isFinite(s))return[];if(s>0)for(t=Math.ceil(t/s),e=Math.floor(e/s),a=new Array(r=Math.ceil(e-t+1));++o<r;)a[o]=(t+o)*s;else for(t=Math.floor(t*s),e=Math.ceil(e*s),a=new Array(r=Math.ceil(t-e+1));++o<r;)a[o]=(t-o)/s;n&&a.reverse();return a}(this._domain[0],this._domain[this._domain.length-1],t||5)},t}();function pi(t,e,i){var n=(e-t)/Math.max(0,i),r=Math.floor(Math.log(n)/Math.LN10),a=n/Math.pow(10,r);return r>=0?(a>=li?10:a>=ci?5:a>=fi?2:1)*Math.pow(10,r):-Math.pow(10,-r)/(a>=li?10:a>=ci?5:a>=fi?2:1)}function di(t,e,i){return("ceil"===i?Math.ceil(t/e):"floor"===i?Math.floor(t/e):Math.round(t/e))*e}function vi(t,e,i){var n=di(t,i,"floor"),r=di(e,i,"ceil");n=y(n,i),r=y(r,i);for(var a=[],s=n;s<=r;s+=i){var o=y(s,i);a.push(o)}return{min:n,max:r,ticks:a}}function yi(t,e,i){var n,r=t.minLimit,a=t.maxLimit,o=t.min,h=t.max,u=t.tickCount,l=void 0===u?5:u,c=s(r)?s(e)?o:e:r,f=s(a)?s(i)?h:i:a;if(c>f&&(f=(n=[c,f])[0],c=n[1]),l<=2)return[c,f];for(var g=(f-c)/(l-1),p=[],d=0;d<l;d++)p.push(c+g*d);return p}function mi(t,e,i){void 0===i&&(i=5);var n={max:0,min:0,ticks:[]};if(t===e)return{max:e,min:t,ticks:[t]};var r=(e-t)/i,a=Math.pow(10,Math.floor(Math.log10(r))),s=a<1?Math.ceil(Math.abs(Math.log10(a))):0,o=a;2*a-r<1.5*(r-o)&&5*a-r<2.75*(r-(o=2*a))&&10*a-r<1.5*(r-(o=5*a))&&(o=10*a);var h=Math.ceil(e/o),u=Math.floor(t/o);n.max=Math.max(h*o,e),n.min=Math.min(u*o,t);for(var l=Number.parseFloat((u*o).toFixed(s));l<e;)n.ticks.push(l),l+=o,s&&(l=Number.parseFloat(l.toFixed(s)));return n.ticks.push(l),n}function xi(t,e){var i=t.length*e;return 1===e?t[t.length-1]:0===e?t[0]:i%1!=0?t[Math.ceil(i)-1]:t.length%2==0?(t[i-1]+t[i])/2:t[i]}function _i(t){return new Date(t).getFullYear()}function Si(t){return new Date(t,0,1).getTime()}function Mi(t){return new Date(t).getMonth()}function wi(t,e){return new Date(t,e,1).getTime()}Qt("cat",ui),Qt("time-cat",(function(t){var e=ui(t),i=v(t.values);return i!==v(e)&&e.push(i),e})),Qt("wilkinson-extended",(function(t){var e=t.min,i=t.max,n=t.tickCount,r=t.nice,a=t.tickInterval,o=t.minLimit,h=t.maxLimit,u=hi(e,i,n,r).ticks;return s(o)&&s(h)?a?vi(e,i,a).ticks:u:yi(t,d(u),v(u))})),Qt("r-pretty",(function(t){var e=t.min,i=t.max,n=t.tickCount,r=t.tickInterval,a=t.minLimit,o=t.maxLimit,h=mi(e,i,n).ticks;return s(a)&&s(o)?r?vi(e,i,r).ticks:h:yi(t,d(h),v(h))})),Qt("time",(function(t){var e=t.min,i=t.max,n=t.minTickInterval,r=t.tickInterval,a=t.tickCount;if(r)a=Math.ceil((i-e)/r);else{var s=(i-e)/(r=Be(e,i,a)[1])/a;s>1&&(r*=Math.ceil(s)),n&&r<n&&(r=n)}for(var o=[],h=e;h<i+r;h+=r)o.push(h);return o})),Qt("time-pretty",(function(t){var e=t.min,i=t.max,n=t.minTickInterval,r=t.tickCount,a=t.tickInterval,s=[];a||(a=(i-e)/r,n&&a<n&&(a=n));var o=_i(e);if(a>31536e6)for(var h=_i(i),u=Math.ceil(a/31536e6),l=o;l<=h+u;l+=u)s.push(Si(l));else if(a>Fe){var c=Math.ceil(a/Fe),f=Mi(e),g=function(t,e){var i=_i(t),n=_i(e),r=Mi(t);return 12*(n-i)+(Mi(e)-r)%12}(e,i);for(l=0;l<=g+c;l+=c)s.push(wi(o,l+f))}else if(a>Ne){var p=(x=new Date(e)).getFullYear(),d=x.getMonth(),v=x.getDate(),y=Math.ceil(a/Ne),m=function(t,e){return Math.ceil((e-t)/Ne)}(e,i);for(l=0;l<m+y;l+=y)s.push(new Date(p,d,v+l).getTime())}else if(a>Ee){p=(x=new Date(e)).getFullYear(),d=x.getMonth(),y=x.getDate();var x,_=x.getHours(),S=Math.ceil(a/Ee),M=function(t,e){return Math.ceil((e-t)/Ee)}(e,i);for(l=0;l<=M+S;l+=S)s.push(new Date(p,d,y,_+l).getTime())}else if(a>6e4){var w=function(t,e){return Math.ceil((e-t)/6e4)}(e,i),b=Math.ceil(a/6e4);for(l=0;l<=w+b;l+=b)s.push(e+6e4*l)}else{var C=a;C<1e3&&(C=1e3);var P=1e3*Math.floor(e/1e3),k=Math.ceil((i-e)/1e3),T=Math.ceil(C/1e3);for(l=0;l<k+T;l+=T)s.push(P+1e3*l)}return s.length>=512&&console.warn("Notice: current ticks length("+s.length+') >= 512, may cause performance issues, even out of memory. Because of the configure "tickInterval"(in milliseconds, current is '+a+") is too small, increase the value to solve the problem!"),s})),Qt("log",(function(t){var e,i=t.base,n=t.tickCount,r=t.min,a=t.max,s=t.values,o=Re(i,a);if(r>0)e=Math.floor(Re(i,r));else{var h=He(s,i,a);e=Math.floor(Re(i,h))}for(var u=o-e,l=Math.ceil(u/n),c=[],f=e;f<o+l;f+=l)c.push(Math.pow(i,f));return r<=0&&c.unshift(0),c})),Qt("pow",(function(t){var e=t.exponent,i=t.tickCount,n=Math.ceil(Ge(e,t.max));return mi(Math.floor(Ge(e,t.min)),n,i).ticks.map((function(t){var i=t>=0?1:-1;return Math.pow(t,e)*i}))})),Qt("quantile",(function(t){var e=t.tickCount,i=t.values;if(!i||!i.length)return[];for(var n=i.slice().sort((function(t,e){return t-e})),r=[],a=0;a<e;a++){var s=a/(e-1);r.push(xi(n,s))}return r})),Qt("d3-linear",(function(t){var e=t.min,i=t.max,n=t.tickInterval,r=t.minLimit,a=t.maxLimit,o=function(t){var e=t.min,i=t.max,n=t.nice,r=t.tickCount,a=new gi;return a.domain([e,i]),n&&a.nice(r),a.ticks(r)}(t);return s(r)&&s(a)?n?vi(e,i,n).ticks:o:yi(t,d(o),v(o))})),Ke("cat",re),Ke("category",re),Ke("identity",Qe),Ke("linear",je),Ke("log",We),Ke("pow",Ve),Ke("time",qe),Ke("timeCat",Xe),Ke("quantize",Ze),Ke("quantile",Ue);var bi=function(t){var e=t.values,i=t.tickCount;if(!i)return e;if(e.length<=1)return e;for(var n=parseInt(e.length/(i-1))||1,r=[],a=0;a<e.length;a+=n)r.push(e[a]);var s=e[e.length-1];return r[r.length-1]!==s&&(r.length>=i?r[r.length-1]=s:r.push(s)),r},Ci=[1,1.2,1.5,2,2.2,2.4,2.5,3,4,5,6,7.5,8,10];function Pi(t){var e=1;if(0===(t=Math.abs(t)))return e;if(t<1){for(var i=0;t<1;)e/=10,t*=10,i++;return e.toString().length>12&&(e=parseFloat(e.toFixed(i))),e}for(;t>10;)e*=10,t/=10;return e}function ki(t){var e=t.interval,i=t.tickCount,n=t.max,r=t.min;return Math.floor(r/e)*e+(i-1)*e>=n}function Ti(t){var e=t.toString(),i=e.indexOf("."),n=e.indexOf("e-"),r=n>=0?parseInt(e.substr(n+2),10):e.substr(i+1).length;return r>20&&(r=20),r}function Di(t,e){return parseFloat(t.toFixed(e))}var Ai=$e("linear"),Ii=$e("identity"),Yi=$e("category"),Oi=$e("timeCat");function Ei(t){Object.keys(t).forEach((function(e){delete t[e]}))}Qt("cat",bi),Qt("time-cat",bi),Qt("wilkinson-extended",(function(t){var e=t||{},i=e.tickCount,n=e.tickInterval,r=t||{},a=r.min,s=r.max;a=isNaN(a)?0:a,s=isNaN(s)?0:s;var o=i&&i>=2?i:5,h=n||function(t){var e=t.tickCount,i=t.min,n=t.max;if(i===n)return 1*Pi(n);for(var r=(n-i)/(e-1),a=Pi(r),s=r/a,o=n/a,h=i/a,u=0,l=0;l<Ci.length;l++){if(s<=Ci[l]){u=l;break}}var c=function t(e,i,n,r){for(var a=!1,s=Ci[e],o=e;o<Ci.length;o++)if(ki({interval:Ci[o],tickCount:i,max:r,min:n})){s=Ci[o],a=!0;break}if(!a)return 10*t(0,i,n/10,r/10);return s}(u,e,h,o),f=Ti(c)+Ti(a);return Di(c*a,f)}({tickCount:o,max:s,min:a}),u=Math.floor(a/h)*h;if(n){var l=Math.abs(Math.ceil((s-u)/n))+1;o=Math.max(o,l)}for(var c=[],f=0,g=Ti(h);f<o;)c.push(Di(u+f*h,g)),f++;return c})),te.Linear=Ai,te.Identity=Ii,te.Category=Yi,te.Cat=Yi,te.TimeCat=Oi;var Ni=function(){function t(t){this.defs={},this.scales={},T(this,t)}var e=t.prototype;return e.setFieldDef=function(t,e){var i=this.defs;h(t)?T(i,t):i[t]=e,this.updateScales()},e._getDef=function(t){var e=this.defs,i=null;return(vt.scales[t]||e[t])&&(i=T({},vt.scales[t]),u(e[t],(function(t,e){s(t)?delete i[e]:i[e]=t}))),i},e._getDefaultType=function(t,e,i){if(i&&i.type)return i.type;var n="linear",r=X(e,t);return o(r)&&(r=r[0]),g(r)&&(n="cat"),n},e._getScaleDef=function(t,e,i,n){var r,a={field:e,values:r=n&&n.values?n.values:B(i,e)};if("cat"!==t&&"timeCat"!==t){if(!n||!n.min||!n.max){var s=R(r),o=s.min,h=s.max;a.min=o,a.max=h,a.nice=!0}}else a.isRounding=!1;return a},e._adjustRange=function(t,e){var i=e.range,n=e.values;if("linear"===t||i||!n)return e;var r=n.length;if(1===r)e.range=[.5,1];else{var a=this.chart.get("coord"),o=vt.widthRatio.multiplePie,h=0;!function(t){if(!t.isPolar)return!1;var e=t.startAngle,i=t.endAngle;return!(!s(e)&&!s(i)&&i-e<2*Math.PI)}(a)?(h=1/r*.5,e.range=[h,1-h]):a.transposed?(h=1/r*o,e.range=[h/2,1-h/2]):e.range=[0,1-1/r]}return e},e._getScaleCfg=function(t,e){var i=this._getDef(t);if(!e||!e.length)return i&&i.type?(i.field=t,{type:i.type,cfg:i}):{type:"identity",cfg:{value:t,field:t.toString(),values:[t]}};var n=e[0][t];if(null===n&&(n=X(e,t)),m(t)||s(n)&&!i)return{type:"identity",cfg:{value:t,field:t.toString(),values:[t]}};var r=this._getDefaultType(t,e,i),a=this._getScaleDef(r,t,e,i);return i&&T(a,i),{type:r,cfg:a=this._adjustRange(r,a)}},e.createScale=function(t,e){var i=this.scales,n=this._getScaleCfg(t,e),r=n.type,a=n.cfg,s=i[t];if(s&&s.type===r)return s.change(a),s;var o=new($e(r))(a);return i[t]=o,o},e._updateScale=function(t){var e=t.field,i=this.chart._getScaleData(e),n=this._getScaleCfg(e,i).cfg;t.change(n)},e.updateScales=function(){var t=this;u(this.scales,(function(e){t._updateScale(e)}))},e.adjustStartZero=function(t){var e=this.defs,i=t.field,n=t.min,r=t.max;e[i]&&e[i].min||(n>0?t.change({min:0}):r<0&&t.change({max:0}))},e.clear=function(){Ei(this.defs),Ei(this.scales),this.data=null},t}(),Fi=function(){var t=e.prototype;function e(t){this._initDefaultCfg(),T(this,t),this.draw()}return t._initDefaultCfg=function(){this.ticks=[],this.tickLine={},this.offsetFactor=1,this.frontContainer=null,this.backContainer=null,this.gridPoints=[]},t.draw=function(){var t=this.line,e=this.tickLine,i=this.label,n=this.grid;n&&this.drawGrid(n),e&&this.drawTicks(e),t&&this.drawLine(t),i&&this.drawLabels()},t.drawTicks=function(t){var e=this,i=e.ticks,n=t.length,r=e.getContainer(t.top);u(i,(function(i){var a=e.getOffsetPoint(i.value),s=e.getSidePoint(a,n);r.addShape("line",{className:"axis-tick",attrs:T({x1:a.x,y1:a.y,x2:s.x,y2:s.y},t)})._id=e._id+"-ticks"}))},t.drawLabels=function(){var t=this,e=t.labelOffset;u(t.labels,(function(i){var n=t.getContainer(i.get("top")),r=t.getOffsetPoint(i.get("value")),a=t.getSidePoint(r,e),s=a.x,o=a.y;i.attr(T({x:s,y:o},t.getTextAlignInfo(r,e),i.get("textStyle"))),i._id=t._id+"-"+i.attr("text"),n.add(i)}))},t.drawLine=function(){},t.drawGrid=function(t){var e=this,i=e.gridPoints,n=e.ticks,r=t,s=i.length;u(i,(function(i,o){if(a(t)){var h=n[o]||{},u=t(h.text,o,s);r=u?T({},vt._defaultAxis.grid,u):null}if(r){var l,c=r.type,f=i.points,g=e.getContainer(r.top);if("arc"===c){var p=e.center,d=e.startAngle,v=e.endAngle,y=Ct.length([f[0].x-p.x,f[0].y-p.y]);l=g.addShape("Arc",{className:"axis-grid",attrs:T({x:p.x,y:p.y,startAngle:d,endAngle:v,r:y},r)})}else l=g.addShape("Polyline",{className:"axis-grid",attrs:T({points:f},r)});l._id=i._id}}))},t.getOffsetPoint=function(){},t.getAxisVector=function(){},t.getOffsetVector=function(t,e){var i=this.getAxisVector(t),n=Ct.normalize([],i),r=this.offsetFactor,a=[-1*n[1]*r,n[0]*r];return Ct.scale([],a,e)},t.getSidePoint=function(t,e){var i=this.getOffsetVector(t,e);return{x:t.x+i[0],y:t.y+i[1]}},t.getTextAlignInfo=function(t,e){var i=this.getOffsetVector(t,e);return{textAlign:i[0]>0?"left":i[0]<0?"right":"center",textBaseline:i[1]>0?"top":i[1]<0?"bottom":"middle"}},t.getContainer=function(t){var e=this.frontContainer,i=this.backContainer;return t?e:i},e}(),zi=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){t.prototype._initDefaultCfg.call(this),this.start=null,this.end=null},i.getOffsetPoint=function(t){var e=this.start,i=this.end;return{x:e.x+(i.x-e.x)*t,y:e.y+(i.y-e.y)*t}},i.getAxisVector=function(){var t=this.start,e=this.end;return[e.x-t.x,e.y-t.y]},i.drawLine=function(t){var e=this.getContainer(t.top),i=this.start,n=this.end;e.addShape("line",{className:"axis-line",attrs:T({x1:i.x,y1:i.y,x2:n.x,y2:n.y},t)})},e}(Fi);Fi.Line=zi;var Bi=function(){function t(t){this.axisCfg={},this.frontPlot=null,this.backPlot=null,this.axes={},T(this,t)}var e=t.prototype;return e._isHide=function(t){var e=this.axisCfg;return!e||!1===e[t]},e._getLinePosition=function(t,e,i,n){var r="",a=t.field,s=this.axisCfg;return s[a]&&s[a].position?r=s[a].position:"x"===e?r=n?"left":"bottom":"y"===e&&(r=i?"right":"left",n&&(r="bottom")),r},e._getLineCfg=function(t,e,i){var n,r,a=1;return"x"===e?(n={x:0,y:0},r={x:1,y:0}):"right"===i?(n={x:1,y:0},r={x:1,y:1}):(n={x:0,y:0},r={x:0,y:1},a=-1),t.transposed&&(a*=-1),{offsetFactor:a,start:t.convertPoint(n),end:t.convertPoint(r)}},e._getCircleCfg=function(t){return{startAngle:t.startAngle,endAngle:t.endAngle,center:t.center,radius:t.circleRadius}},e._getRadiusCfg=function(t){var e,i;return t.transposed?(e={x:0,y:0},i={x:1,y:0}):(e={x:0,y:0},i={x:0,y:1}),{offsetFactor:-1,start:t.convertPoint(e),end:t.convertPoint(i)}},e._getAxisCfg=function(t,e,i,n,r){var s=this,o=this,h=this.axisCfg,l=e.getTicks(),c=A({ticks:l,frontContainer:this.frontPlot,backContainer:this.backPlot},r,h[e.field]),f=[],g=c.label,p=l.length,d=0,v=0,y=g;return u(l,(function(t,e){if(a(g)){var i=g(t.text,e,p);y=i?T({},vt._defaultAxis.label,i):null}if(y){var n={};y.textAlign&&(n.textAlign=y.textAlign),y.textBaseline&&(n.textBaseline=y.textBaseline);var r=(y.top?s.frontPlot:s.backPlot).addShape("text",{className:"axis-label",aria:!1,attrs:T({x:0,y:0,text:t.text,fontFamily:o.chart.get("canvas").get("fontFamily")},y),value:t.value,textStyle:n,top:y.top,context:o.chart.get("canvas").get("context")});f.push(r);var h=r.getBBox(),u=h.width,l=h.height;d=Math.max(d,u),v=Math.max(v,l)}})),c.labels=f,c.maxWidth=d,c.maxHeight=v,c},e._createAxis=function(t,e,i,n,r){void 0===r&&(r="");var a,s,o,h=t.type,u=t.transposed;if("cartesian"===h||"rect"===h){var l=this._getLinePosition(e,n,r,u);(o=vt.axis[l]).position=l,a="Line",s=l}else"x"===n&&!u||"y"===n&&u?(o=vt.axis.circle,a="Circle",s="circle"):(o=vt.axis.radius,a="Line",s="radius");var c=this._getAxisCfg(t,e,i,n,o);c.type=a,c.dimType=n,c.verticalScale=i,c.index=r,this.axes[s]=c},e.createAxis=function(t,e,i){var n=this;e&&!n._isHide(e.field)&&n._createAxis(t,e,i[0],"x"),u(i,(function(i,r){n._isHide(i.field)||n._createAxis(t,i,e,"y",r)}));var r=this.axes,a=n.chart;if(a._isAutoPadding()){var o=ut(a.get("padding")),h=ut(a.get("appendPadding")),l=a.get("legendRange")||{top:0,right:0,bottom:0,left:0},c=["auto"===o[0]?l.top+2*h[0]:o[0],"auto"===o[1]?l.right+h[1]:o[1],"auto"===o[2]?l.bottom+h[2]:o[2],"auto"===o[3]?l.left+h[3]:o[3]];if(t.isPolar){var f=r.circle;if(f){var g=f.maxHeight,p=f.maxWidth,d=f.labelOffset;c[0]+=g+d,c[1]+=p+d,c[2]+=g+d,c[3]+=p+d}}else{if(r.right&&"auto"===o[1]){var v=r.right,y=v.maxWidth,m=v.labelOffset;c[1]+=y+m}if(r.left&&"auto"===o[3]){var x=r.left,_=x.maxWidth,S=x.labelOffset;c[3]+=_+S}if(r.bottom&&"auto"===o[2]){var M=r.bottom,w=M.maxHeight,b=M.labelOffset;c[2]+=w+b}}a.set("_padding",c),a._updateLayout(c)}u(r,(function(e){var i,r=e.type,a=e.grid,o=e.verticalScale,h=e.ticks,l=e.dimType,c=e.position,f=e.index;if(t.isPolar?"Line"===r?i=n._getRadiusCfg(t):"Circle"===r&&(i=n._getCircleCfg(t)):i=n._getLineCfg(t,l,c),a&&o){var g=[],p=function(t){var e=t.slice(0);if(e.length>0){var i=e[0],n=e[e.length-1];0!==i.value&&e.unshift({value:0}),1!==n.value&&e.push({value:1})}return e}(o.getTicks());u(h,(function(e){var i=[];u(p,(function(n){var r="x"===l?e.value:n.value,a="x"===l?n.value:e.value;if(r>=0&&r<=1&&a>=0&&a<=1){var s=t.convertPoint({x:r,y:a});i.push(s)}})),g.push({points:i,_id:"axis-"+l+f+"-grid-"+e.tickValue})})),e.gridPoints=g,t.isPolar&&(e.center=t.center,e.startAngle=t.startAngle,e.endAngle=t.endAngle)}i._id="axis-"+l,s(f)||(i._id="axis-"+l+f),new Fi[r](T(e,i))}))},e.clear=function(){this.axes={},this.frontPlot.clear(),this.backPlot.clear()},t}(),Xi=function(t,e){var i=e.x-t.x,n=e.y-t.y;return Math.abs(i)>Math.abs(n)?i>0?"right":"left":n>0?"down":"up"},Li=function(t,e){var i=Math.abs(e.x-t.x),n=Math.abs(e.y-t.y);return Math.sqrt(i*i+n*n)},ji=function(){function t(t){var e=this,i=t.canvas,n=t.el;yt(this,"_click",(function(t){var i=st(t,e.canvas);t.points=i,e.emitEvent("click",t)})),yt(this,"_start",(function(t){var i,n,r=st(t,e.canvas);r&&(t.points=r,e.emitEvent("touchstart",t),e.reset(),e.startTime=Date.now(),e.startPoints=r,r.length>1?(e.startDistance=Li(r[0],r[1]),e.center=(i=r[0],n=r[1],{x:i.x+(n.x-i.x)/2,y:i.y+(n.y-i.y)/2})):e.pressTimeout=setTimeout((function(){t.direction="none",e.emitStart("press",t),e.emitEvent("press",t),e.eventType="press",e.direction="none"}),250))})),yt(this,"_move",(function(t){var i=st(t,e.canvas);if(i){e.clearPressTimeout(),t.points=i,e.emitEvent("touchmove",t);var n=e.startPoints;if(n)if(i.length>1){var r=e.startDistance,a=Li(i[0],i[1]);t.zoom=a/r,t.center=e.center,e.emitStart("pinch",t),e.emitEvent("pinch",t)}else{var s=i[0].x-n[0].x,o=i[0].y-n[0].y,h=e.direction||Xi(n[0],i[0]);e.direction=h;var u=e.getEventType(i);t.direction=h,t.deltaX=s,t.deltaY=o,e.emitStart(u,t),e.emitEvent(u,t);var l=e.lastMoveTime,c=Date.now();c-l>0&&(e.prevMoveTime=l,e.prevMovePoints=e.lastMovePoints,e.lastMoveTime=c,e.lastMovePoints=i)}}})),yt(this,"_end",(function(t){var i=st(t,e.canvas);t.points=i,e.emitEnd(t),e.emitEvent("touchend",t);var n=e.lastMoveTime;if(Date.now()-n<100){var r=n-(e.prevMoveTime||e.startTime);if(r>0){var a=e.prevMovePoints||e.startPoints,s=e.lastMovePoints,o=Li(a[0],s[0])/r;o>.3&&(t.velocity=o,t.direction=Xi(a[0],s[0]),e.emitEvent("swipe",t))}}e.reset();var h=t.touches;h&&h.length>0&&e._start(t)})),yt(this,"_cancel",(function(t){e.emitEvent("touchcancel",t),e.reset()})),this.canvas=i,this.delegateEvent(n),this.processEvent={}}var e=t.prototype;return e.delegateEvent=function(t){t.addEventListener("click",this._click),t.addEventListener("touchstart",this._start),t.addEventListener("touchmove",this._move),t.addEventListener("touchend",this._end),t.addEventListener("touchcancel",this._cancel)},e.emitEvent=function(t,e){this.canvas.emit(t,e)},e.getEventType=function(t){var e,i=this.eventType,n=this.canvas,r=this.startTime,a=this.startPoints;if(i)return i;var s=n.__events.pan;s&&s.length?e=Date.now()-r>250&&Li(a[0],t[0])<10?"press":"pan":e="press";return this.eventType=e,e},e.enable=function(t){this.processEvent[t]=!0},e.isProcess=function(t){return this.processEvent[t]},e.emitStart=function(t,e){this.isProcess(t)||(this.enable(t),this.emitEvent(t+"start",e))},e.emitEnd=function(t){var e=this,i=this.processEvent;Object.keys(i).forEach((function(n){e.emitEvent(n+"end",t),delete i[n]}))},e.clearPressTimeout=function(){this.pressTimeout&&(clearTimeout(this.pressTimeout),this.pressTimeout=0)},e.reset=function(){this.clearPressTimeout(),this.startTime=0,this.startPoints=null,this.startDistance=0,this.direction=null,this.eventType=null,this.pinch=!1,this.prevMoveTime=0,this.prevMovePoints=null,this.lastMoveTime=0,this.lastMovePoints=null},t}(),Gi=function(t){function e(e){var i;return(i=t.call(this)||this).context=e,i.width=0,i.height=0,i.style={},i.currentStyle={},i.attrs={},i.isCanvasElement=!0,i}xt(e,t);var i=e.prototype;return i.getContext=function(){return this.context},i.getBoundingClientRect=function(){return{top:0,right:this.width,bottom:this.height,left:0}},i.setAttribute=function(t,e){this.attrs[t]=e},i.addEventListener=function(t,e){this.on(t,e)},i.removeEventListener=function(t,e){this.off(t,e)},i.dispatchEvent=function(t,e){this.emit(t,e)},e}(St);var Ri=function(t){return t?function(t){if(!t)return!1;if(1!==t.nodeType||!t.nodeName||"canvas"!==t.nodeName.toLowerCase())return!1;var e=!1;try{t.addEventListener("eventTest",(function(){e=!0})),t.dispatchEvent(new Event("eventTest"))}catch(t){e=!1}return e}(t.canvas)?t.canvas:new Gi(t):null};function Hi(t,e){u(t,(function(t){t=t.split(":"),e.addColorStop(Number(t[0]),t[1])}))}function Wi(t,e,i){if("("===t[1])try{var n=t[0];if("l"===n)return function(t,e,i){var n,r,a=t.split(" "),s=a[0].slice(2,a[0].length-1);n=parseFloat(s)*Math.PI/180,r=2*Math.PI,s=(n%r+r)%r;var o,h,u=a.slice(1),l=e.getBBox(),c=l.minX,f=l.minY,g=l.maxX,p=l.maxY;s>=0&&s<.5*Math.PI?(o={x:c,y:f},h={x:g,y:p}):.5*Math.PI<=s&&s<Math.PI?(o={x:g,y:f},h={x:c,y:p}):Math.PI<=s&&s<1.5*Math.PI?(o={x:g,y:p},h={x:c,y:f}):(o={x:c,y:p},h={x:g,y:f});var d=Math.tan(s),v=d*d,y=(h.x-o.x+d*(h.y-o.y))/(v+1)+o.x,m=d*(h.x-o.x+d*(h.y-o.y))/(v+1)+o.y,x=i.createLinearGradient(o.x,o.y,y,m);return Hi(u,x),x}(t,e,i);if("r"===n)return function(t,e,i){var n=t.split(" "),r=n[0].slice(2,n[0].length-1);r=r.split(",");var a=parseFloat(r[0]),s=parseFloat(r[1]),o=parseFloat(r[2]),h=n.slice(1);if(0===o)return h[h.length-1].split(":")[1];var u=e.getBBox(),l=u.width,c=u.height,f=u.minX,g=u.minY,p=Math.sqrt(l*l+c*c)/2,d=i.createRadialGradient(f+l*a,g+c*s,o*p,f+l/2,g+c/2,p);return Hi(h,d),d}(t,e,i)}catch(t){console.error("error in parsing gradient string, please check if there are any extra whitespaces."),console.error(t)}return t}var Vi={stroke:"strokeStyle",fill:"fillStyle",opacity:"globalAlpha"},qi=["fillStyle","font","globalAlpha","lineCap","lineWidth","lineJoin","miterLimit","shadowBlur","shadowColor","shadowOffsetX","shadowOffsetY","strokeStyle","textAlign","textBaseline","lineDash","shadow"],Zi=["circle","sector","polygon","rect","polyline"],Ui=function(){var t=e.prototype;function e(t){this._initProperties(),T(this._attrs,t);var e=this._attrs.attrs;e&&this.initAttrs(e),this.initTransform()}return t._initProperties=function(){this._attrs={zIndex:0,visible:!0,destroyed:!1}},t.get=function(t){return this._attrs[t]},t.set=function(t,e){this._attrs[t]=e},t.isGroup=function(){return this.get("isGroup")},t.isShape=function(){return this.get("isShape")},t.initAttrs=function(t){this.attr(T(this.getDefaultAttrs(),t))},t.getDefaultAttrs=function(){return{}},t._setAttr=function(t,e){var i=this._attrs.attrs;if("clip"===t)e=this._setAttrClip(e);else{var n=Vi[t];n&&(i[n]=e)}i[t]=e},t._getAttr=function(t){return this._attrs.attrs[t]},t._setAttrClip=function(t){return t&&Zi.indexOf(t._attrs.type)>-1?(null===t.get("canvas")&&(t=Object.assign({},t)),t.set("parent",this.get("parent")),t.set("context",this.get("context")),t):null},t.attr=function(t,e){var i=this;if(i.get("destroyed"))return null;var n=arguments.length;if(0===n)return i._attrs.attrs;if(h(t)){for(var r in this._attrs.bbox=null,t)i._setAttr(r,t[r]);return i._afterAttrsSet&&i._afterAttrsSet(),i}return 2===n?(this._attrs.bbox=null,i._setAttr(t,e),i._afterAttrsSet&&i._afterAttrsSet(),i):i._getAttr(t)},t.getParent=function(){return this.get("parent")},t.draw=function(t){this.get("destroyed")||this.get("visible")&&(this.setContext(t),this.drawInner(t),this.restoreContext(t))},t.setContext=function(t){var e=this._attrs.attrs.clip;t.save(),e&&(e.resetTransform(t),e.createPath(t),t.clip()),this.resetContext(t),this.resetTransform(t)},t.restoreContext=function(t){t.restore()},t.resetContext=function(t){var e=this._attrs.attrs;for(var i in e)if(qi.indexOf(i)>-1){var n=e[i];"fillStyle"!==i&&"strokeStyle"!==i||!n||(n=Wi(n,this,t)),"lineDash"===i&&t.setLineDash&&o(n)?t.setLineDash(n):t[i]=n}},t.hasFill=function(){return this.get("canFill")&&this._attrs.attrs.fillStyle},t.hasStroke=function(){return this.get("canStroke")&&this._attrs.attrs.strokeStyle},t.drawInner=function(){},t.show=function(){return this.set("visible",!0),this},t.hide=function(){return this.set("visible",!1),this},t.isVisible=function(){return this.get("visible")},t.getAriaLabel=function(){var t=this._attrs,e=t.destroyed,i=t.visible,n=t.isShape,r=t.aria;if(!e&&i&&(!n||r))return this._getAriaLabel()},t._getAriaLabel=function(){return this._attrs.ariaLabel},t._removeFromParent=function(){var t=this.get("parent");t&&G(t.get("children"),this);return this},t.remove=function(t){t?this.destroy():this._removeFromParent()},t.destroy=function(){if(this.get("destroyed"))return null;this._removeFromParent(),this._attrs={},this.set("destroyed",!0)},t.getBBox=function(){return{minX:0,maxX:0,minY:0,maxY:0,width:0,height:0}},t.initTransform=function(){var t=this._attrs.attrs||{};t.matrix||(t.matrix=[1,0,0,1,0,0]),this._attrs.attrs=t},t.getMatrix=function(){return this._attrs.attrs.matrix},t.setMatrix=function(t){this._attrs.attrs.matrix=[t[0],t[1],t[2],t[3],t[4],t[5]]},t.transform=function(t){var e=this._attrs.attrs.matrix;return this._attrs.attrs.matrix=bt.transform(e,t),this},t.setTransform=function(t){return this._attrs.attrs.matrix=[1,0,0,1,0,0],this.transform(t)},t.translate=function(t,e){var i=this._attrs.attrs.matrix;bt.translate(i,i,[t,e])},t.rotate=function(t){var e=this._attrs.attrs.matrix;bt.rotate(e,e,t)},t.scale=function(t,e){var i=this._attrs.attrs.matrix;bt.scale(i,i,[t,e])},t.moveTo=function(t,e){var i=this._attrs.x||0,n=this._attrs.y||0;this.translate(t-i,e-n),this.set("x",t),this.set("y",e)},t.apply=function(t){var e=this._attrs.attrs.matrix;return Ct.transformMat2d(t,t,e),this},t.resetTransform=function(t){var e=this._attrs.attrs.matrix;bt.isChanged(e)&&t.transform(e[0],e[1],e[2],e[3],e[4],e[5],!0)},t.isDestroyed=function(){return this.get("destroyed")},e}(),Ji=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){this._attrs={zIndex:0,visible:!0,destroyed:!1,isShape:!0,attrs:{}}},i.getType=function(){return this._attrs.type},i.drawInner=function(t){var e=this.get("attrs");this.createPath(t);var i=t.globalAlpha;if(this.hasFill()){var n=e.fillOpacity;s(n)||1===n?t.fill():(t.globalAlpha=n,t.fill(),t.globalAlpha=i)}if(this.hasStroke()&&e.lineWidth>0){var r=e.strokeOpacity;s(r)||1===r||(t.globalAlpha=r),t.stroke()}},i.getBBox=function(){var t=this._attrs.bbox;return t||((t=this.calculateBox())&&(t.x=t.minX,t.y=t.minY,t.width=t.maxX-t.minX,t.height=t.maxY-t.minY),this._attrs.bbox=t),t},i.calculateBox=function(){return null},i.createPath=function(){},e}(Ui);var $i=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canFill=!0,this._attrs.canStroke=!0,this._attrs.type="rect"},i.getDefaultAttrs=function(){return{x:0,y:0,width:0,height:0,radius:0,lineWidth:0}},i.createRadiusPath=function(t,e,i,n,r,a){a=function(t,e,i){if(!((t=ut(t))[0]||t[1]||t[2]||t[3]))return t;var n=Math.max(t[0]+t[1],t[2]+t[3]),r=Math.max(t[0]+t[3],t[1]+t[2]),a=Math.min(e/n,i/r);return a<1?t.map((function(t){return t*a})):t}(a,n,r),t.moveTo(e+a[0],i),t.lineTo(e+n-a[1],i),t.arc(e+n-a[1],i+a[1],a[1],-Math.PI/2,0,!1),t.lineTo(e+n,i+r-a[2]),t.arc(e+n-a[2],i+r-a[2],a[2],0,Math.PI/2,!1),t.lineTo(e+a[3],i+r),t.arc(e+a[3],i+r-a[3],a[3],Math.PI/2,Math.PI,!1),t.lineTo(e,i+a[0]),t.arc(e+a[0],i+a[0],a[0],Math.PI,3*Math.PI/2,!1),t.closePath()},i.createPath=function(t){var e=this.get("attrs"),i=e.x,n=e.y,r=e.width,a=e.height,s=e.radius;t.beginPath(),s&&r*a?this.createRadiusPath(t,i,n,r,a,s):t.rect(i,n,r,a)},i.calculateBox=function(){var t=this.get("attrs"),e=t.x,i=t.y;return{minX:e,minY:i,maxX:e+t.width,maxY:i+t.height}},e}(Ji),Ki=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canFill=!1,this._attrs.canStroke=!1,this._attrs.loading=!1,this._attrs.image=null,this._attrs.type="image"},i.createPath=function(t){var e=this,i=this.get("attrs").src;if(!this.get("loading")){var n=this.get("image");if(n)this.drawImage(t,n);else if(i&&Image){this.set("loading",!0);var r=new Image;r.src=i,r.crossOrigin="Anonymous",r.onload=function(){e.set("loading",!1),e.set("image",r),e.drawImage(t,r)}}}},i.drawImage=function(t,e){var i=this._attrs,n=i.attrs;if(!i.destroyed){var r=n.x,a=n.y,o=n.width,h=n.height,u=n.sx,l=n.sy,c=n.swidth,f=n.sheight,g=n.radius;g&&(t.save(),this.createRadiusPath(t,r,a,o,h,g),t.clip()),s(u)||s(l)||s(c)||s(f)?t.drawImage(e,r,a,o,h):t.drawImage(e,u,l,c,f,r,a,o,h),g&&t.restore()}},e}($i),Qi=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canFill=!0,this._attrs.canStroke=!0,this._attrs.type="circle"},i.getDefaultAttrs=function(){return{x:0,y:0,r:0,lineWidth:0}},i.createPath=function(t){var e=this.get("attrs"),i=e.x,n=e.y,r=e.r;t.beginPath(),t.arc(i,n,r,0,2*Math.PI,!1),t.closePath()},i.calculateBox=function(){var t=this.get("attrs"),e=t.x,i=t.y,n=t.r;return{minX:e-n,maxX:e+n,minY:i-n,maxY:i+n}},e}(Ji),tn=Ct.create(),en=Ct.create(),nn=Ct.create();function rn(t,e,i,n,r){var a=t*t;return e+(3*-e+t*(3*e-e*t))*t+(3*i+t*(-6*i+3*i*t))*t+(3*n-3*n*t)*a+r*(a*t)}function an(t){for(var e,i,n,r,a,s=1/0,o=-1/0,h=1/0,u=-1/0,l={x:t[0],y:t[1]},c={x:t[2],y:t[3]},f={x:t[4],y:t[5]},g={x:t[6],y:t[7]},p=0;p<100;p++){var d={x:rn(a=p/100,(e=l).x,(i=c).x,(n=f).x,(r=g).x),y:rn(a,e.y,i.y,n.y,r.y)};d.x<s&&(s=d.x),d.x>o&&(o=d.x),d.y<h&&(h=d.y),d.y>u&&(u=d.y)}return{minX:s,minY:h,maxX:o,maxY:u}}function sn(t,e){if(0!==t.length){for(var i=t[0],n=i.x,r=i.x,a=i.y,s=i.y,o=t.length,h=1;h<o;h++)i=t[h],n=Math.min(n,i.x),r=Math.max(r,i.x),a=Math.min(a,i.y),s=Math.max(s,i.y);return{minX:n-(e=e/2||0),minY:a-e,maxX:r+e,maxY:s+e}}}function on(t,e,i,n,r,a){var s=Math.abs(n-r);if(s%(2*Math.PI)<1e-4&&s>1e-4)return{minX:t-i,minY:e-i,maxX:t+i,maxY:e+i};tn[0]=Math.cos(n)*i+t,tn[1]=Math.sin(n)*i+e,en[0]=Math.cos(r)*i+t,en[1]=Math.sin(r)*i+e;var o=[0,0],h=[0,0];if(Ct.min(o,tn,en),Ct.max(h,tn,en),(n%=2*Math.PI)<0&&(n+=2*Math.PI),(r%=2*Math.PI)<0&&(r+=2*Math.PI),n>r&&!a?r+=2*Math.PI:n<r&&a&&(n+=2*Math.PI),a){var u=r;r=n,n=u}for(var l=0;l<r;l+=Math.PI/2)l>n&&(nn[0]=Math.cos(l)*i+t,nn[1]=Math.sin(l)*i+e,Ct.min(o,nn,o),Ct.max(h,nn,h));return{minX:o[0],minY:o[1],maxX:h[0],maxY:h[1]}}var hn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canStroke=!0,this._attrs.type="line"},i.getDefaultAttrs=function(){return{x1:0,y1:0,x2:0,y2:0,lineWidth:1}},i.createPath=function(t){var e=this.get("attrs"),i=e.x1,n=e.y1,r=e.x2,a=e.y2;t.beginPath(),t.moveTo(i,n),t.lineTo(r,a)},i.calculateBox=function(){var t=this.get("attrs");return function(t,e,i,n,r){return r=r/2||0,{minX:Math.min(t,i)-r,minY:Math.min(e,n)-r,maxX:Math.max(t,i)+r,maxY:Math.max(e,n)+r}}(t.x1,t.y1,t.x2,t.y2,t.lineWidth)},e}(Ji),un=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canFill=!0,this._attrs.canStroke=!0,this._attrs.type="polygon"},i.getDefaultAttrs=function(){return{points:null,lineWidth:0}},i.createPath=function(t){var e=this.get("attrs").points;t.beginPath();for(var i=0,n=e.length;i<n;i++){var r=e[i];0===i?t.moveTo(r.x,r.y):t.lineTo(r.x,r.y)}t.closePath()},i.calculateBox=function(){return sn(this.get("attrs").points)},e}(Ji);function ln(t){return[t.x,t.y]}function cn(t,e,i){for(var n,r,a,s=!!e,o=function(t,e,i,n){var r,a,s,o,h,u,l,c,f=[],g=!!n;if(g){for(s=[1/0,1/0],o=[-1/0,-1/0],c=0,l=t.length;c<l;c++)h=ln(t[c]),Ct.min(s,s,h),Ct.max(o,o,h);Ct.min(s,s,n[0]),Ct.max(o,o,n[1])}for(c=0,u=t.length;c<u;c++){if(h=ln(t[c]),i)r=ln(t[c?c-1:u-1]),a=ln(t[(c+1)%u]);else{if(0===c||c===u-1){f.push([h[0],h[1]]);continue}r=ln(t[c-1]),a=ln(t[c+1])}var p=Ct.sub([],a,r);Ct.scale(p,p,e);var d=Ct.distance(h,r),v=Ct.distance(h,a),y=d+v;0!==y&&(d/=y,v/=y);var m=Ct.scale([],p,-d),x=Ct.scale([],p,v),_=Ct.add([],h,m),S=Ct.add([],h,x);g&&(Ct.max(_,_,s),Ct.min(_,_,o),Ct.max(S,S,s),Ct.min(S,S,o)),f.push([_[0],_[1]]),f.push([S[0],S[1]])}return i&&f.push(f.shift()),f}(t,.4,s,i),h=t.length,u=[],l=0;l<h-1;l++)n=o[2*l],r=o[2*l+1],a=t[l+1],u.push(["C",n[0],n[1],r[0],r[1],a.x,a.y]);return s&&(n=o[h],r=o[h+1],a=t[0],u.push(["C",n[0],n[1],r[0],r[1],a.x,a.y])),u}function fn(t){for(var e=[],i=0,n=t.length;i<n;i++){var r=t[i];isNaN(r.x)||isNaN(r.y)||e.push(r)}return e}var gn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canFill=!0,this._attrs.canStroke=!0,this._attrs.type="polyline"},i.getDefaultAttrs=function(){return{points:null,lineWidth:1,smooth:!1}},i.createPath=function(t){var e=this.get("attrs"),i=e.points,n=e.smooth,r=fn(i);if(t.beginPath(),r.length)if(t.moveTo(r[0].x,r[0].y),n)for(var a=cn(r,!1,[[0,0],[1,1]]),s=0,o=a.length;s<o;s++){var h=a[s];t.bezierCurveTo(h[1],h[2],h[3],h[4],h[5],h[6])}else{var u,l;for(u=1,l=r.length-1;u<l;u++)t.lineTo(r[u].x,r[u].y);t.lineTo(r[l].x,r[l].y)}},i.calculateBox=function(){var t=this.get("attrs"),e=t.points,i=t.smooth,n=t.lineWidth,r=fn(e);if(i){for(var a=[],s=cn(r,!1,[[0,0],[1,1]]),o=0,h=s.length;o<h;o++){var u=s[o];if(0===o)a.push([r[0].x,r[0].y,u[1],u[2],u[3],u[4],u[5],u[6]]);else{var l=s[o-1];a.push([l[5],l[6],u[1],u[2],u[3],u[4],u[5],u[6]])}}return function(t,e){for(var i=1/0,n=-1/0,r=1/0,a=-1/0,s=0,o=t.length;s<o;s++){var h=an(t[s]);h.minX<i&&(i=h.minX),h.maxX>n&&(n=h.maxX),h.minY<r&&(r=h.minY),h.maxY>a&&(a=h.maxY)}return{minX:i-(e=e/2||0),minY:r-e,maxX:n+e,maxY:a+e}}(a,n)}return sn(r,n)},e}(Ji),pn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canStroke=!0,this._attrs.canFill=!0,this._attrs.type="arc"},i.getDefaultAttrs=function(){return{x:0,y:0,r:0,startAngle:0,endAngle:2*Math.PI,anticlockwise:!1,lineWidth:1}},i.createPath=function(t){var e=this.get("attrs"),i=e.x,n=e.y,r=e.r,a=e.startAngle,s=e.endAngle,o=e.anticlockwise;t.beginPath(),a!==s&&t.arc(i,n,r,a,s,o)},i.calculateBox=function(){var t=this.get("attrs");return on(t.x,t.y,t.r,t.startAngle,t.endAngle,t.anticlockwise)},e}(Ji),dn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canFill=!0,this._attrs.canStroke=!0,this._attrs.type="sector"},i.getDefaultAttrs=function(){return{x:0,y:0,lineWidth:0,r:0,r0:0,startAngle:0,endAngle:2*Math.PI,anticlockwise:!1}},i.createPath=function(t){var e=this.get("attrs"),i=e.x,n=e.y,r=e.startAngle,a=e.endAngle,s=e.r,o=e.r0,h=e.anticlockwise;t.beginPath();var u=Math.cos(r),l=Math.sin(r);t.moveTo(u*o+i,l*o+n),t.lineTo(u*s+i,l*s+n),(Math.abs(a-r)>1e-4||0===r&&a<0)&&(t.arc(i,n,s,r,a,h),t.lineTo(Math.cos(a)*o+i,Math.sin(a)*o+n),0!==o&&t.arc(i,n,o,a,r,!h)),t.closePath()},i.calculateBox=function(){var t=this.get("attrs"),e=t.x,i=t.y,n=t.r,r=t.r0,a=t.startAngle,s=t.endAngle,o=t.anticlockwise,h=on(e,i,n,a,s,o),u=on(e,i,r,a,s,o);return{minX:Math.min(h.minX,u.minX),minY:Math.min(h.minY,u.minY),maxX:Math.max(h.maxX,u.maxX),maxY:Math.max(h.maxY,u.maxY)}},e}(Ji),vn=function(t){var e=t.width,i=t.height,n=t.rotate,r=Math.abs(n);return{width:Math.abs(e*Math.cos(r)+i*Math.sin(r)),height:Math.abs(i*Math.cos(r)+e*Math.sin(r))}},yn=0,mn={},xn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canFill=!0,this._attrs.canStroke=!0,this._attrs.type="text"},i.getDefaultAttrs=function(){return{lineWidth:0,lineCount:1,fontSize:12,fontFamily:"sans-serif",fontStyle:"normal",fontWeight:"normal",fontVariant:"normal",textAlign:"start",textBaseline:"bottom",lineHeight:null,textArr:null}},i._getFontStyle=function(){var t=this._attrs.attrs,e=t.fontSize,i=t.fontFamily,n=t.fontWeight;return t.fontStyle+" "+t.fontVariant+" "+n+" "+e+"px "+i},i._afterAttrsSet=function(){var t=this._attrs.attrs;if(t.font=this._getFontStyle(),t.text){var e=t.text,i=null,n=1;g(e)&&-1!==e.indexOf("\n")&&(n=(i=e.split("\n")).length),t.lineCount=n,t.textArr=i}this.set("attrs",t)},i._getTextHeight=function(){var t=this._attrs.attrs;if(t.height)return t.height;var e=t.lineCount,i=1*t.fontSize;return e>1?i*e+this._getSpaceingY()*(e-1):i},i._getSpaceingY=function(){var t=this._attrs.attrs,e=t.lineHeight,i=1*t.fontSize;return e?e-i:.14*i},i.drawInner=function(t){var e=this._attrs.attrs,i=e.text,n=e.x,r=e.y;if(!(s(i)||isNaN(n)||isNaN(r))){var a=e.textArr,o=1*e.fontSize,h=this._getSpaceingY();e.rotate&&(t.translate(n,r),t.rotate(e.rotate),n=0,r=0);var u,l,c=e.textBaseline;if(a&&(u=this._getTextHeight()),this.hasFill()){var f=e.fillOpacity;if(s(f)||1===f||(t.globalAlpha=f),a)for(var g=0,p=a.length;g<p;g++){var d=a[g];l=r+g*(h+o)-u+o,"middle"===c&&(l+=u-o-(u-o)/2),"top"===c&&(l+=u-o),t.fillText(d,n,l)}else t.fillText(i,n,r)}if(this.hasStroke())if(a)for(var v=0,y=a.length;v<y;v++){var m=a[v];l=r+v*(h+o)-u+o,"middle"===c&&(l+=u-o-(u-o)/2),"top"===c&&(l+=u-o),t.strokeText(m,n,l)}else t.strokeText(i,n,r)}},i._getAriaLabel=function(){return this._attrs.attrs.text},i.calculateBox=function(){var t=this._attrs.attrs,e=t.x,i=t.y,n=t.textAlign,r=t.textBaseline,a=this._getTextWidth();if(!a)return{minX:e,minY:i,maxX:e,maxY:i};var s=this._getTextHeight();if(t.rotate){var o=vn({width:a,height:s,rotate:t.rotate});a=o.width,s=o.height}var h={x:e,y:i-s};return n&&("end"===n||"right"===n?h.x-=a:"center"===n&&(h.x-=a/2)),r&&("top"===r?h.y+=s:"middle"===r&&(h.y+=s/2)),{minX:h.x,minY:h.y,maxX:h.x+a,maxY:h.y+s}},i._getTextWidth=function(){var t=this._attrs.attrs;if(t.width)return t.width;var e=t.text,i=this.get("context");if(!s(e)){var n=t.font,r=t.textArr,a=e+""+n;if(mn[a])return mn[a];var o=0;if(r)for(var h=0,u=r.length;h<u;h++){var l=r[h];o=Math.max(o,ht(l,n,i).width)}else o=ht(e,n,i).width;return yn>5e3&&(yn=0,mn={}),yn++,mn[a]=o,o}},e}(Ji),_n=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canFill=!0,this._attrs.canStroke=!0,this._attrs.createPath=null,this._attrs.type="custom"},i.createPath=function(t){var e=this.get("createPath");e&&e.call(this,t)},i.calculateBox=function(){var t=this.get("calculateBox");return t&&t.call(this)},e}(Ji),Sn={circle:function(t,e,i,n){n.arc(t,e,i,0,2*Math.PI,!1)},square:function(t,e,i,n){n.moveTo(t-i,e-i),n.lineTo(t+i,e-i),n.lineTo(t+i,e+i),n.lineTo(t-i,e+i),n.closePath()}},Mn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){t.prototype._initProperties.call(this),this._attrs.canFill=!0,this._attrs.canStroke=!0,this._attrs.type="marker"},i.getDefaultAttrs=function(){return{x:0,y:0,lineWidth:0}},i.createPath=function(t){var e,i=this.get("attrs"),n=i.x,r=i.y,s=i.radius,o=i.symbol||"circle";e=a(o)?o:Sn[o],t.beginPath(),e(n,r,s,t,this)},i.calculateBox=function(){var t=this.get("attrs"),e=t.x,i=t.y,n=t.radius;return{minX:e-n,minY:i-n,maxX:e+n,maxY:i+n}},e}(Ji);Ji.Rect=$i,Ji.Image=Ki,Ji.Circle=Qi,Ji.Line=hn,Ji.Polygon=un,Ji.Polyline=gn,Ji.Arc=pn,Ji.Sector=dn,Ji.Text=xn,Ji.Custom=_n,Ji.Marker=Mn;var wn={};var bn={getGroupClass:function(){},getChildren:function(){return this.get("children")},addShape:function(t,e){void 0===e&&(e={});var i=wn[t];i||(i=M(t),wn[t]=i);var n=new Ji[i](e);return this.add(n),n},addGroup:function(t){var e=new(this.getGroupClass())(t);return this.add(e),e},contain:function(t){return this.get("children").indexOf(t)>-1},sort:function(){for(var t=this.get("children"),e=0,i=t.length;e<i;e++){t[e]._INDEX=e}return t.sort(function(t){return function(e,i){var n=t(e,i);return 0===n?e._INDEX-i._INDEX:n}}((function(t,e){return t.get("zIndex")-e.get("zIndex")}))),this},drawChildren:function(t){for(var e=this.get("children"),i=0,n=e.length;i<n;i++){e[i].draw(t)}return this},clear:function(){for(var t=this.get("children");0!==t.length;)t[t.length-1].remove(!0);return this},add:function(t){var e=this.get("children");o(t)||(t=[t]);for(var i=0,n=t.length;i<n;i++){var r=t[i],a=r.get("parent");if(a)G(a.get("children"),r);this._setEvn(r),e.push(r)}return this},_setEvn:function(t){var e=this._attrs,i=e.context,n=e.canvas,r=e.aria,a=t._attrs,s=a.isGroup,o=a.type;t._attrs.parent=this,t._attrs.context=i,t._attrs.canvas=n,r&&!1!==t._attrs.aria&&(t._attrs.aria=r),"text"===o&&n&&n.get("fontFamily")&&(t._attrs.attrs.fontFamily=t._attrs.attrs.fontFamily||n.get("fontFamily"));var h=t._attrs.attrs.clip;if(h&&(h._attrs.parent=this,h._attrs.context=i,h._attrs.canvas=n),s)for(var u=t._attrs.children,l=0,c=u.length;l<c;l++)t._setEvn(u[l])},_getAriaLabel:function(){var t=this._attrs,e=t.aria,i=t.ariaLabel,n=t.children;if(e){var r=[];if(n&&n.length)for(var a=0,s=n.length;a<s;a++){var o=n[a].getAriaLabel();o&&r.push(o)}var h=r.join(" ");return i&&h?i+" "+h+" ":i||h}}},Cn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initProperties=function(){this._attrs={type:"group",zIndex:0,visible:!0,destroyed:!1,isGroup:!0,canFill:!0,canStroke:!0,attrs:{},children:[]}},i.getBBox=function(){for(var t=1/0,e=-1/0,i=1/0,n=-1/0,r=this.get("children"),a=0,s=r.length;a<s;a++){var o=r[a];if(o.get("visible")){var h=o.getBBox();if(!h)continue;var u=[h.minX,h.minY],l=[h.minX,h.maxY],c=[h.maxX,h.minY],f=[h.maxX,h.maxY],g=o.attr("matrix");Ct.transformMat2d(u,u,g),Ct.transformMat2d(l,l,g),Ct.transformMat2d(c,c,g),Ct.transformMat2d(f,f,g),t=Math.min(u[0],l[0],c[0],f[0],t),e=Math.max(u[0],l[0],c[0],f[0],e),i=Math.min(u[1],l[1],c[1],f[1],i),n=Math.max(u[1],l[1],c[1],f[1],n)}}return{minX:t,minY:i,maxX:e,maxY:n,x:t,y:i,width:e-t,height:n-i}},i.createPath=function(e){var i=this.get("attrs");(i.fillStyle||i.strokeStyle)&&t.prototype.createPath.call(this,e)},i.drawInner=function(e){t.prototype.drawInner.call(this,e),this.drawChildren(e)},i.destroy=function(){this.get("destroyed")||(this.clear(),t.prototype.destroy.call(this))},e}($i);T(Cn.prototype,bn,{getGroupClass:function(){return Cn}});var Pn="object"==typeof window&&window.requestAnimationFrame?window.requestAnimationFrame:function(t){return setTimeout(t,16)},kn=function(t){xt(i,t);var e=i.prototype;function i(e){var i;i=t.call(this)||this;var n=e.title,r=n?S(dt.general.withTitle,{title:n}):dt.general.title;return i._attrs=T({type:"canvas",children:[],ariaLabel:r},e),i._initPixelRatio(),i._initCanvas(),i}return e.get=function(t){return this._attrs[t]},e.set=function(t,e){this._attrs[t]=e},e._initPixelRatio=function(){this.get("pixelRatio")||this.set("pixelRatio",$())},e.beforeDraw=function(){var t=this._attrs.context,e=this._attrs.el;t&&t.clearRect&&t.clearRect(0,0,e.width,e.height)},e._initCanvas=function(){var t,e=this.get("el"),i=this.get("context");if(!e&&!i)throw new Error("Please specify the id, el or context of the chart!");t=e?g(e)?et(e):e:Ri(i),i&&t&&!t.getContext&&(t.getContext=function(){return i});var n=this.get("width");n||(n=Q(t));var r=this.get("height");r||(r=tt(t)),this.set("canvas",this),this.set("el",t),this.set("context",i||t.getContext("2d")),this.changeSize(n,r);var a=new ji({canvas:this,el:t});this.set("eventController",a)},e.changeSize=function(t,e){var i=this.get("pixelRatio"),n=this.get("el");(n.style&&(n.style.width=t+"px",n.style.height=e+"px"),J(n))&&(n.width=t*i,n.height=e*i,1!==i&&this.get("context").scale(i,i));this.set("width",t),this.set("height",e)},e.getWidth=function(){var t=this.get("pixelRatio");return this.get("width")*t},e.getHeight=function(){var t=this.get("pixelRatio");return this.get("height")*t},e.getPointByClient=function(t,e){var i=this.get("el"),n=i.getBoundingClientRect(),r=n.right-n.left,a=n.bottom-n.top;return{x:(t-n.left)*(i.width/r),y:(e-n.top)*(i.height/a)}},e._beginDraw=function(){this._attrs.toDraw=!0},e._endDraw=function(){this._attrs.toDraw=!1},e.draw=function(){var t=this;t.get("destroyed")||(t.get("animateHandler")?this._beginDraw():function e(){t.set("animateHandler",Pn((function(){t.set("animateHandler",void 0),t.get("toDraw")&&e()}))),t.beforeDraw();try{var i=t._attrs.context;t.drawChildren(i),i.draw&&i.draw(),t.setAriaLabel()}catch(e){console.warn("error in draw canvas, detail as:"),console.warn(e),t._endDraw()}t._endDraw()}())},e.setAriaLabel=function(){var t=this._attrs.el,e=this._getAriaLabel();e&&t.setAttribute&&t.setAttribute("aria-label",e)},e.destroy=function(){if(!this.get("destroyed")){var t=this.get("el");t.width=0,t.height=0,this.clear(),this._attrs={},this.set("destroyed",!0)}},e.isDestroyed=function(){return this.get("destroyed")},i}(St);T(kn.prototype,bn,{getGroupClass:function(){return Cn}});var Tn={};function Dn(t){var e=Tn[t];return e||{Canvas:kn,Group:Cn,Shape:Ji}}function An(t){return new(Dn(t.renderer).Canvas)(t)}var In=Object.freeze({__proto__:null,registerEngine:function(t,e){Tn[t]=e},getEngine:Dn,createCanvas:An,Canvas:kn,Group:Cn,Shape:Ji,Matrix:bt,Vector2:Ct});function Yn(t){var e,i=t.start,n=t.end,r=n.x-i.x,a=Math.abs(n.y-i.y);if(t.isPolar){var s=t.circleRadius,o=t.center,h=t.startAngle,u=t.endAngle;e=new Ji.Sector({attrs:{x:o.x,y:o.y,r:s,r0:0,startAngle:h,endAngle:u}})}else e=new Ji.Rect({attrs:{x:i.x,y:n.y-10,width:r,height:a+20}});return e.isClip=!0,e}function On(t,e){var i=t.x,n=t.y,r=e.tl,a=e.tr,s=e.br;return i>=r.x&&i<=a.x&&n>=r.y&&n<=s.y}var En=Object.freeze({__proto__:null,getClip:Yn,isPointInPlot:On});function Nn(t,e){return t-e}var Fn=function(t){xt(i,t),i.initPlugins=function(){return{_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var i=e.indexOf(t);-1!==i&&e.splice(i,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,i){var n,r,a,s,o=this.descriptors(t),h=o.length;for(n=0;n<h;++n)if("function"==typeof(s=(r=o[n].plugin)[e])&&(a=[t].concat(i||[]),!1===s.apply(r,a)))return!1;return!0},descriptors:function(t){var e=t._plugins||(t._plugins={});if(e.id===this._cacheId)return e.descriptors;var i=[],n=[];return this._plugins.concat(t&&t.get("plugins")||[]).forEach((function(t){-1===i.indexOf(t)&&(i.push(t),n.push({plugin:t}))})),e.descriptors=n,e.id=this._cacheId,n}}};var e=i.prototype;function i(e){var i,n=_t(i=t.call(this,e)||this);return u(Jt,(function(t,e){var i=_(e);n[i]=function(e){var i=new t(e);return n.addGeom(i),i}})),n._init(),i}return e.getDefaultCfg=function(){return{id:null,renderer:"canvas",rendered:!1,padding:vt.padding,data:null,scales:{},geoms:[],colDefs:null,pixelRatio:vt.pixelRatio,filters:null,appendPadding:vt.appendPadding}},e._syncYScales=function(){if(this.get("syncY")){var t=this.get("geoms"),e=[],i=[],n=[];u(t,(function(t){var r=t.getYScale();r.isLinear&&(e.push(r),i.push(r.min),n.push(r.max))})),i=Math.min.apply(null,i),n=Math.max.apply(null,n),u(e,(function(t){t.change({min:i}),t.change({max:n})}))}},e._getFieldsForLegend=function(){var t=[];return u(this.get("geoms"),(function(e){var i=e.get("attrOptions").color;i&&i.field&&g(i.field)&&u(i.field.split("*"),(function(e){-1===t.indexOf(e)&&t.push(e)}))})),t},e._getScaleData=function(t){var e=this.get("data"),i=this.get("filteredData");i.length&&(-1===this._getFieldsForLegend().indexOf(t)&&(e=i));return e},e._adjustScale=function(){for(var t=this.get("scaleController"),e=this.get("geoms"),i=0;i<e.length;i++){var n=e[i];if("interval"===n.get("type")){var r=n.getYScale();t.adjustStartZero(r)}}},e._removeGeoms=function(){for(var t=this.get("geoms");t.length>0;){t.shift().destroy()}},e._clearGeoms=function(){for(var t=this.get("geoms"),e=0,i=t.length;e<i;e++){t[e].clear()}},e._clearInner=function(){this._clearGeoms(),i.plugins.notify(this,"clearInner"),this.emit("clearinner"),this.get("axisController")&&this.get("axisController").clear()},e._initFilteredData=function(){var t=this.get("filters"),e=this.get("data")||[];t&&(e=e.filter((function(e){var i=!0;return u(t,(function(t,n){if(t&&!(i=t(e[n],e)))return!1})),i}))),this.set("filteredData",e)},e._changeGeomsData=function(){for(var t=this.get("geoms"),e=this.get("filteredData"),i=0,n=t.length;i<n;i++){t[i].changeData(e)}},e._initGeom=function(t){if(!t.get("isInit")){var e=this.get("coord"),i=this.get("filteredData"),n=this.get("colDefs"),r=this.get("middlePlot");t.set("chart",this),t.set("container",r.addGroup()),t.set("data",i),t.set("coord",e),t.set("colDefs",n),t.init(),this.emit("_aftergeominit",t)}},e._initGeoms=function(){for(var t=this.get("geoms"),e=0,i=t.length;e<i;e++)this._initGeom(t[e])},e._initCoord=function(){var t=this.get("plotRange"),e=T({type:"cartesian"},this.get("coordCfg"),{plot:t}),i=e.type,n=new(0,kt[M(i)])(e);this.set("coord",n)},e._initLayout=function(){var t=this.get("_padding");t||(t=ut(t=this.get("margin")||this.get("padding")));var e="auto"===t[0]?0:t[0],i="auto"===t[1]?0:t[1],n="auto"===t[2]?0:t[2],r={x:"auto"===t[3]?0:t[3],y:e},a={x:this.get("width")-i,y:this.get("height")-n},s=this.get("plot");if(s)s.reset(r,a);else{var o=new wt({start:r,end:a});this.set("plotRange",o),this.set("plot",o)}},e._initCanvas=function(){try{var t=An({renderer:this.get("renderer"),el:this.get("el")||this.get("id"),context:this.get("context"),pixelRatio:this.get("pixelRatio"),width:this.get("width"),height:this.get("height"),fontFamily:vt.fontFamily,aria:this.get("aria"),title:this.get("title"),landscape:this.get("landscape")});this.set("canvas",t),this.set("el",t.get("el")),this.set("width",t.get("width")),this.set("height",t.get("height"))}catch(t){throw t}i.plugins.notify(this,"afterCanvasInit")},e._initLayers=function(){var t=this.get("canvas");this.set("backPlot",t.addGroup()),this.set("middlePlot",t.addGroup({zIndex:10})),this.set("frontPlot",t.addGroup({zIndex:20}))},e._initEvents=function(){var t=this;this.on("afterdatachange",(function(){t._initFilteredData(),t._changeGeomsData()})),this.on("_aftersizechange",(function(){t._initLayout();var e=t.get("coord");e&&e.reset(t.get("plot"))}))},e._initScaleController=function(){var t=new Ni({chart:this});this.set("colDefs",t.defs),this.set("scales",t.scales),this.set("scaleController",t)},e._clearScaleController=function(){this.get("scaleController").clear()},e._init=function(){this._initCanvas(),this._initLayout(),this._initLayers(),this._initEvents(),this._initScaleController(),this.set("axisController",new Bi({frontPlot:this.get("frontPlot").addGroup({className:"axisContainer"}),backPlot:this.get("backPlot").addGroup({className:"axisContainer"}),chart:this})),i.plugins.notify(this,"init")},e.init=function(){this._initFilteredData(),this._initCoord(),i.plugins.notify(this,"beforeGeomInit"),this._initGeoms(),this._syncYScales(),this._adjustScale(),this.emit("afterinit")},e.source=function(t,e){return this.set("data",t),e&&this.scale(e),this},e.scale=function(t,e){return this.get("scaleController").setFieldDef(t,e),this},e.axis=function(t,e){var i=this.get("axisController");return t?(i.axisCfg=i.axisCfg||{},i.axisCfg[t]=e):i.axisCfg=null,this},e.coord=function(t,e){var i;return h(t)?i=t:(i=e||{}).type=t||"cartesian",this.set("coordCfg",i),this},e.filter=function(t,e){var i=this.get("filters")||{};i[t]=e,this.set("filters",i),this.get("rendered")&&this.emit("afterdatachange",this.get("data"))},e.render=function(){var t=this.get("rendered"),e=this.get("canvas"),n=this.get("geoms");t?(this._initGeoms(),this._adjustScale()):(this.init(),this.set("rendered",!0)),this.emit("beforerender"),i.plugins.notify(this,"beforeGeomDraw"),this._renderAxis();var r=this.get("middlePlot");if(this.get("limitInPlot")&&!r.attr("clip")){var a=Yn(this.get("coord"));a.set("canvas",r.get("canvas")),r.attr("clip",a)}this.emit("beforegeomdraw");for(var s=0,o=n.length;s<o;s++){n[s].paint()}return this.emit("aftergeomdraw"),i.plugins.notify(this,"afterGeomDraw"),e.sort(),this.get("frontPlot").sort(),i.plugins.notify(this,"beforeCanvasDraw"),e.draw(),this.emit("afterrender"),this},e.clear=function(){return i.plugins.notify(this,"clear"),this.emit("clear"),this._clearInner(),this._removeGeoms(),this._clearScaleController(),this.set("legendItems",null),this.set("filters",null),this.set("isUpdate",!1),this.set("_padding",null),this.set("rendered",!1),this.get("canvas").draw(),this},e.repaint=function(){this.get("rendered")&&(this.set("isUpdate",!0),this.set("legendItems",null),i.plugins.notify(this,"repaint"),this._clearInner(),this.emit("repaint"),this.render())},e.changeData=function(t){this.emit("beforedatachange",t),this.set("data",t),i.plugins.notify(this,"changeData"),this.emit("afterdatachange",t),this.set("_padding",null),this.repaint()},e.changeSize=function(t,e){return t?this.set("width",t):t=this.get("width"),e?this.set("height",e):e=this.get("height"),this.get("canvas").changeSize(t,e),this.emit("_aftersizechange",{width:t,height:e}),this.repaint(),this},e.destroy=function(){this.clear(),this.get("canvas").destroy(),i.plugins.notify(this,"afterCanvasDestroyed"),this._interactions&&u(this._interactions,(function(t){t.destroy()})),t.prototype.destroy.call(this)},e.getPosition=function(t){for(var e=this.get("coord"),i=this.getXScale(),n=i.field,r=this.getYScales(),a=r[0],s=a.field,o=0,h=r.length;o<h;o++){var u=r[o],l=u.field;if(t[l]){a=u,s=l;break}}var c=i.scale(t[n]),f=a.scale(t[s]);return e.convertPoint({x:c,y:f})},e.getRecord=function(t){var e=this.get("coord"),i=this.getXScale(),n=this.getYScales()[0],r=e.invertPoint(t),a={};return a[i.field]=i.invert(r.x),a[n.field]=n.invert(r.y),a},e.getSnapRecords=function(t){var e=this.get("geoms")[0],i=[];return e&&(i=e.getSnapRecords(t)),i},e.createScale=function(t){var e=this._getScaleData(t);return this.get("scaleController").createScale(t,e)},e.addGeom=function(t){this.get("geoms").push(t)},e.getXScale=function(){return this.get("geoms")[0].getXScale()},e.getYScales=function(){var t=this.get("geoms"),e=[];return u(t,(function(t){var i=t.getYScale();-1===e.indexOf(i)&&e.push(i)})),e},e.getLegendItems=function(){if(this.get("legendItems"))return this.get("legendItems");var t={},e=[];return u(this.get("geoms"),(function(i){var n=i.getAttr("color");if(n){var r=n.getScale("color");if(r.isCategory&&!function(t,e){var i=!1;return u(t,(function(t){var n=[].concat(t.values),r=[].concat(e.values);t.type!==e.type||t.field!==e.field||n.sort(Nn).toString()!==r.sort(Nn).toString()||(i=!0)})),i}(e,r)){e.push(r);var a=r.field,s=r.getTicks(),o=[];u(s,(function(t){var e=t.text,i=t.value,a=r.invert(i),s={fill:n.mapping(a).join("")||vt.defaultColor,radius:3,symbol:"circle",stroke:"#fff"};o.push({name:e,dataValue:a,checked:!0,marker:s})})),t[a]=o}}})),this.set("legendItems",t),t},e.registerPlugins=function(t){var e=this,n=e.get("plugins")||[];o(n)||(n=[n]),[].concat(t).forEach((function(t){-1===n.indexOf(t)&&(t.init&&t.init(e),n.push(t))})),i.plugins._cacheId++,e.set("plugins",n)},e._renderAxis=function(){var t=this.get("axisController"),e=this.getXScale(),n=this.getYScales(),r=this.get("coord");i.plugins.notify(this,"beforeRenderAxis"),t.createAxis(r,e,n)},e._isAutoPadding=function(){if(this.get("_padding"))return!1;var t=this.get("padding");return o(t)?-1!==t.indexOf("auto"):"auto"===t},e._updateLayout=function(t){var e=this.get("width"),i=this.get("height"),n={x:t[3],y:t[0]},r={x:e-t[1],y:i-t[2]},a=this.get("plot"),s=this.get("coord");a.reset(n,r),s.reset(a)},e.landscape=function(t){this.get("canvas").set("landscape",t)},i}(Mt);Fn.plugins=Fn.initPlugins();var zn=function(){return null};function Bn(t){var e=[],i=t.x,n=t.y;return(n=o(n)?n:[n]).forEach((function(t,n){var r={x:o(i)?i[n]:i,y:t};e.push(r)})),e}function Xn(t,e,i){if(!t.length)return[];var n,r=[],a=[];return u(t,(function(t){n=t._origin?t._origin[e]:t[e],i?s(n)||a.push(t):o(n)&&s(n[0])||s(n)?a.length&&(r.push(a),a=[]):a.push(t)})),a.length&&r.push(a),r}jt.registerFactory("point",{defaultShapeType:"circle",getDefaultPoints:function(t){return Bn(t)}});function Ln(t,e,i){if(0!==t.size){var n=function(t){var e={lineWidth:0,stroke:t.color,fill:t.color};return t.size&&(e.size=t.size),T(e,t.style),T({},vt.shape.point,e)}(t),r=n.r||n.size,a=t.x,s=o(t.y)?t.y:[t.y];"hollowCircle"===i&&(n.lineWidth=1,n.fill=null);for(var h=0,u=s.length;h<u;h++)return"rect"===i?e.addShape("Rect",{className:"point",attrs:T({x:a-r,y:s[h]-r,width:2*r,height:2*r},n)}):e.addShape("Circle",{className:"point",attrs:T({x:a,y:s[h],r:r},n)})}}u(["circle","hollowCircle","rect"],(function(t){jt.registerShape("point",t,{draw:function(e,i){return Ln(e,i,t)}})}));var jn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i.getDefaultCfg=function(){var e=t.prototype.getDefaultCfg.call(this);return e.type="point",e.shapeType="point",e.generatePoints=!1,e},i.draw=function(t,e){var i=this,n=i.get("container");u(t,(function(t){var r=t.shape,a=i.getDrawCfg(t);if(o(t.y)){var h=i.hasAdjust("stack");u(t.y,(function(s,o){a.y=s,h&&0===o||i.drawShape(r,t,a,n,e)}))}else s(t.y)||i.drawShape(r,t,a,n,e)}))},e}(Jt);Jt.Point=jn;jt.registerFactory("line",{defaultShapeType:"line"});u(["line","smooth","dash"],(function(t){jt.registerShape("line",t,{draw:function(e,i){var n="smooth"===t,r=function(t){var e={strokeStyle:t.color};return t.size>=0&&(e.lineWidth=t.size),T(e,t.style),T({},vt.shape.line,e)}(e);return"dash"===t&&(r.lineDash=vt.lineDash),function(t,e,i,n){var r=t.points;if(r.length&&o(r[0].y)){for(var a=[],s=[],h=0,u=r.length;h<u;h++){var l=Bn(r[h]);s.push(l[0]),a.push(l[1])}return t.isInCircle&&(a.push(a[0]),s.push(s[0])),t.isStack?e.addShape("Polyline",{className:"line",attrs:T({points:a,smooth:n},i)}):[e.addShape("Polyline",{className:"line",attrs:T({points:a,smooth:n},i)}),e.addShape("Polyline",{className:"line",attrs:T({points:s,smooth:n},i)})]}return t.isInCircle&&r.push(r[0]),e.addShape("Polyline",{className:"line",attrs:T({points:r,smooth:n},i)})}(e,i,r,n)}})}));var Gn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i.getDefaultCfg=function(){var e=t.prototype.getDefaultCfg.call(this);return e.type="path",e.shapeType="line",e},i.getDrawCfg=function(e){var i=t.prototype.getDrawCfg.call(this,e);return i.isStack=this.hasAdjust("stack"),i},i.draw=function(t,e){var i=this,n=i.get("container"),r=i.getYScale(),a=i.get("connectNulls"),s=Xn(t,r.field,a),o=this.getDrawCfg(t[0]);o.origin=t,u(s,(function(r,a){o.splitedIndex=a,o.points=r,i.drawShape(o.shape,t[0],o,n,e)}))},e}(Jt);Jt.Path=Gn;var Rn=function(t){function e(){return t.apply(this,arguments)||this}return xt(e,t),e.prototype.getDefaultCfg=function(){var e=t.prototype.getDefaultCfg.call(this);return e.type="line",e.sortable=!0,e},e}(Gn);function Hn(t,e){return Math.abs(t-e)<1e-5}function Wn(t){return!isNaN(t)&&!s(t)}function Vn(t){for(var e=[],i=0,n=t.length;i<n;i++){var r=t[i];Wn(r.x)&&Wn(r.y)&&e.push(r)}return e}function qn(t,e,i){var n=t.points,r=[],a=[];u(n,(function(t){a.push(t[0]),r.push(t[1])}));var s=T({fillStyle:t.color},vt.shape.area,t.style);return a.reverse(),r=this.parsePoints(r),a=this.parsePoints(a),t.isInCircle&&(r.push(r[0]),a.unshift(a[a.length-1]),function(t,e){var i=!0;return u(t,(function(t){if(!Hn(t.x,e.x)||!Hn(t.y,e.y))return i=!1,!1})),i}(a,t.center)&&(a=[])),function(t,e,i,n,r){var a=t.concat(e);return r?i.addShape("Custom",{className:"area",attrs:T({points:a},n),createPath:function(t){var e=[[0,0],[1,1]],i=Vn(this._attrs.attrs.points),n=i.length,r=i.slice(0,n/2),a=i.slice(n/2,n),s=cn(r,!1,e);t.beginPath(),t.moveTo(r[0].x,r[0].y);for(var o=0,h=s.length;o<h;o++){var u=s[o];t.bezierCurveTo(u[1],u[2],u[3],u[4],u[5],u[6])}if(a.length){var l=cn(a,!1,e);t.lineTo(a[0].x,a[0].y);for(var c=0,f=l.length;c<f;c++){var g=l[c];t.bezierCurveTo(g[1],g[2],g[3],g[4],g[5],g[6])}}t.closePath()},calculateBox:function(){return sn(Vn(this._attrs.attrs.points))}}):i.addShape("Polyline",{className:"area",attrs:T({points:a},n)})}(r,a,e,s,i)}Jt.Line=Rn;jt.registerFactory("area",{defaultShapeType:"area",getDefaultPoints:function(t){var e=t.x,i=t.y,n=t.y0;i=o(i)?i:[n,i];var r=[];return r.push({x:e,y:i[0]},{x:e,y:i[1]}),r}});u(["area","smooth"],(function(t){jt.registerShape("area",t,{draw:function(e,i){var n="smooth"===t;return qn.call(this,e,i,n)}})}));var Zn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i.getDefaultCfg=function(){var e=t.prototype.getDefaultCfg.call(this);return e.type="area",e.shapeType="area",e.generatePoints=!0,e.sortable=!0,e},i.draw=function(t,e){var i=this,n=i.get("container"),r=this.getDrawCfg(t[0]),a=i.getYScale(),s=i.get("connectNulls"),o=Xn(t,a.field,s);r.origin=t,u(o,(function(a,s){r.splitedIndex=s;var o=a.map((function(t){return t.points}));r.points=o,i.drawShape(r.shape,t[0],r,n,e)}))},e}(Jt);Jt.Area=Zn;var Un={initEvent:function(){var t=this,e=this.get("chart");e&&e.on("_aftersizechange",(function(){t.set("_width",null)}))},getDefaultSize:function(){var t=this.get("defaultSize");if(!t){var e=this.get("coord"),i=this.getXScale(),n=this.get("dataArray"),r=p(i.values).length,a=i.range,s=1/r,o=1;e&&e.isPolar?o=e.transposed&&r>1?vt.widthRatio.multiplePie:vt.widthRatio.rose:(i.isLinear&&(s*=a[1]-a[0]),o=vt.widthRatio.column),s*=o,this.hasAdjust("dodge")&&(s/=n.length),t=s,this.set("defaultSize",t)}return t},getDimWidth:function(t){var e=this.get("coord"),i=e.convertPoint({x:0,y:0}),n=e.convertPoint({x:"x"===t?1:0,y:"x"===t?0:1}),r=0;return i&&n&&(r=Math.sqrt(Math.pow(n.x-i.x,2)+Math.pow(n.y-i.y,2))),r},_getWidth:function(){var t=this.get("_width");if(!t){var e=this.get("coord");t=e&&e.isPolar&&!e.transposed?(e.endAngle-e.startAngle)*e.circleRadius:this.getDimWidth("x"),this.set("_width",t)}return t},_toNormalizedSize:function(t){return t/this._getWidth()},_toCoordSize:function(t){return this._getWidth()*t},getNormalizedSize:function(t){var e=this.getAttrValue("size",t);return e=s(e)?this.getDefaultSize():this._toNormalizedSize(e)},getSize:function(t){var e=this.getAttrValue("size",t);if(s(e)){var i=this.getDefaultSize();e=this._toCoordSize(i)}return e}};function Jn(t){var e,i,n=t.x,r=t.y,a=t.y0,s=t.size,h=a,u=r;return o(r)&&(u=r[1],h=r[0]),o(n)?(e=n[0],i=n[1]):(e=n-s/2,i=n+s/2),[{x:e,y:h},{x:e,y:u},{x:i,y:u},{x:i,y:h}]}jt.registerFactory("interval",{defaultShapeType:"rect",getDefaultPoints:function(t){return Jn(t)}});jt.registerShape("interval","rect",{draw:function(t,e){var i=this.parsePoints(t.points),n=T({fill:t.color},vt.shape.interval,t.style);if(t.isInCircle){var r=i.slice(0);this._coord.transposed&&(r=[i[0],i[3],i[2],i[1]]);var a=t.center,s=a.x,o=a.y,h=[1,0],u=[r[0].x-s,r[0].y-o],l=[r[1].x-s,r[1].y-o],c=[r[2].x-s,r[2].y-o],f=Ct.angleTo(h,l),g=Ct.angleTo(h,c),p=Ct.length(u),d=Ct.length(l);return f>=1.5*Math.PI&&(f-=2*Math.PI),g>=1.5*Math.PI&&(g-=2*Math.PI),e.addShape("Sector",{className:"interval",attrs:T({x:s,y:o,r:d,r0:p,startAngle:f,endAngle:g},n)})}var v=function(t){for(var e=[],i=[],n=0,r=t.length;n<r;n++){var a=t[n];e.push(a.x),i.push(a.y)}var s=Math.min.apply(null,e),o=Math.min.apply(null,i);return{x:s,y:o,width:Math.max.apply(null,e)-s,height:Math.max.apply(null,i)-o}}(i);return e.addShape("rect",{className:"interval",attrs:T(v,n)})}}),["pyramid","funnel"].forEach((function(t){jt.registerShape("interval",t,{getPoints:function(t){return t.size=2*t.size,Jn(t)},draw:function(e,i){var n,r,a=this.parsePoints(e.points),s=this.parsePoints(e.nextPoints),o=null;s?o=[a[0],a[1],s[1],s[0]]:(o=[a[0],a[1]],"pyramid"===t?o.push((n=a[2],r=a[3],{x:(n.x-r.x)/2+r.x,y:(n.y-r.y)/2+r.y})):o.push(a[2],a[3]));var h=T({fill:e.color,points:o},vt.shape.interval,e.style);return i.addShape("polygon",{className:"interval",attrs:h})}})}));var $n=function(t){xt(i,t);var e=i.prototype;function i(e){var i;return T(_t(i=t.call(this,e)||this),Un),i}return e.getDefaultCfg=function(){var e=t.prototype.getDefaultCfg.call(this);return e.type="interval",e.shapeType="interval",e.generatePoints=!0,e},e.init=function(){t.prototype.init.call(this),this.initEvent()},e.createShapePointsCfg=function(e){var i=t.prototype.createShapePointsCfg.call(this,e);return i.size=this.getNormalizedSize(e),i},e.clearInner=function(){t.prototype.clearInner.call(this),this.set("defaultSize",null)},i}(Jt);Jt.Interval=$n;jt.registerFactory("polygon",{defaultShapeType:"polygon",getDefaultPoints:function(t){for(var e=[],i=t.x,n=t.y,r=0,a=i.length;r<a;r++)e.push({x:i[r],y:n[r]});return e}});jt.registerShape("polygon","polygon",{draw:function(t,e){var i=this.parsePoints(t.points),n=T({fill:t.color,points:i},t.style);return e.addShape("Polygon",{className:"polygon",attrs:n})}});var Kn=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i.getDefaultCfg=function(){var e=t.prototype.getDefaultCfg.call(this);return e.type="polygon",e.shapeType="polygon",e.generatePoints=!0,e},i.createShapePointsCfg=function(e){var i,n=t.prototype.createShapePointsCfg.call(this,e),r=n.x,a=n.y;if(!o(r)||!o(a)){var s=this.getXScale(),h=this.getYScale(),u=.5/(s.values?s.values.length:s.ticks.length),l=.5/(h.values?h.values.length:h.ticks.length);s.isCategory&&h.isCategory?(r=[r-u,r-u,r+u,r+u],a=[a-l,a+l,a+l,a-l]):o(r)?(r=[(i=r)[0],i[0],i[1],i[1]],a=[a-l/2,a+l/2,a+l/2,a-l/2]):o(a)&&(a=[(i=a)[0],i[1],i[1],i[0]],r=[r-u/2,r-u/2,r+u/2,r+u/2]),n.x=r,n.y=a}return n},e}(Jt);Jt.Polygon=Kn;jt.registerFactory("schema",{});jt.registerShape("schema","candle",{getPoints:function(t){return e=t.x,i=t.y,n=t.size,r=function(t){var e=t.sort((function(t,e){return t<e?1:-1})),i=e.length;if(i<4)for(var n=e[i-1],r=0;r<4-i;r++)e.push(n);return e}(i),[{x:e,y:r[0]},{x:e,y:r[1]},{x:e-n/2,y:r[2]},{x:e-n/2,y:r[1]},{x:e+n/2,y:r[1]},{x:e+n/2,y:r[2]},{x:e,y:r[2]},{x:e,y:r[3]}];var e,i,n,r},draw:function(t,e){var i=this.parsePoints(t.points),n=T({stroke:t.color,fill:t.color,lineWidth:1},t.style);return e.addShape("Custom",{className:"schema",attrs:n,createPath:function(t){t.beginPath(),t.moveTo(i[0].x,i[0].y),t.lineTo(i[1].x,i[1].y),t.moveTo(i[2].x,i[2].y);for(var e=3;e<6;e++)t.lineTo(i[e].x,i[e].y);t.closePath(),t.moveTo(i[6].x,i[6].y),t.lineTo(i[7].x,i[7].y)}})}});var Qn=function(t){xt(i,t);var e=i.prototype;function i(e){var i;return T(_t(i=t.call(this,e)||this),Un),i}return e.getDefaultCfg=function(){var e=t.prototype.getDefaultCfg.call(this);return e.type="schema",e.shapeType="schema",e.generatePoints=!0,e},e.init=function(){t.prototype.init.call(this),this.initEvent()},e.createShapePointsCfg=function(e){var i=t.prototype.createShapePointsCfg.call(this,e);return i.size=this.getNormalizedSize(e),i},e.clearInner=function(){t.prototype.clearInner.call(this),this.set("defaultSize",null)},i}(Jt);Jt.Schema=Qn;var tr={}.toString,er=function(t,e){return tr.call(t)==="[object "+e+"]"},ir=Array.isArray?Array.isArray:function(t){return er(t,"Array")},nr=function(t){return null==t};var rr=function(t){var e,i;function n(){return t.apply(this,arguments)||this}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,e.__proto__=i;var r=n.prototype;return r._initDefaultCfg=function(){this.xField=null,this.yField=null},r.processAdjust=function(t){this.processStack(t)},r.processStack=function(t){var e=this.xField,i=this.yField,n=t.length,r={positive:{},negative:{}};this.reverseOrder&&(t=t.slice(0).reverse());for(var a=0;a<n;a++)for(var s=t[a],o=0,h=s.length;o<h;o++){var u=s[o],l=u[e]||0,c=u[i],f=l.toString();if(c=ir(c)?c[1]:c,!nr(c)){var g=c>=0?"positive":"negative";r[g][f]||(r[g][f]=0),u[i]=[r[g][f],c+r[g][f]],r[g][f]+=c}}},n}(Vt);Vt.Stack=rr;var ar="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},sr=function(t){var e=void 0===t?"undefined":ar(t);return null!==t&&"object"===e||"function"===e},or=function(t,e){if(t){if(ir(t))for(var i=0,n=t.length;i<n&&!1!==e(t[i],i);i++);else if(sr(t))for(var r in t)if(t.hasOwnProperty(r)&&!1===e(t[r],r))break}};var hr=function(t){var e,i;function n(){return t.apply(this,arguments)||this}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,e.__proto__=i;var r=n.prototype;return r._initDefaultCfg=function(){this.marginRatio=.5,this.dodgeRatio=.5,this.adjustNames=["x","y"]},r.getDodgeOffset=function(t,e,i){var n=t.pre,r=t.next,a=r-n,s=a*this.dodgeRatio/i,o=this.marginRatio*s;return(n+r)/2+(.5*(a-i*s-(i-1)*o)+((e+1)*s+e*o)-.5*s-.5*a)},r.processAdjust=function(t){var e=this,i=t.length,n=e.xField;or(t,(function(t,r){for(var a=0,s=t.length;a<s;a++){var o=t[a],h=o[n],u={pre:1===s?h-1:h-.5,next:1===s?h+1:h+.5},l=e.getDodgeOffset(u,r,i);o[n]=l}}))},n}(Vt);Vt.Dodge=hr;var ur=function(t){return er(t,"Function")},lr=function(t,e){if(ir(t)){var i=t[0],n=void 0;n=ur(e)?e(t[0]):t[0][e];var r=void 0;return or(t,(function(t){(r=ur(e)?e(t):t[e])>n&&(i=t,n=r)})),i}};var cr={merge:function(t){for(var e=[],i=0;i<t.length;i++)e=e.concat(t[i]);return e}},fr=function(t){var e,i;function n(){return t.apply(this,arguments)||this}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,e.__proto__=i;var r=n.prototype;return r._initDefaultCfg=function(){this.xField=null,this.yField=null,this.cacheMax=null,this.adjustNames=["y"],this.groupFields=null},r._getMax=function(t){var e=this.mergeData,i=lr(e,(function(e){var i=e[t];return ir(i)?Math.max.apply(null,i):i}))[t];return ir(i)?Math.max.apply(null,i):i},r._getXValuesMax=function(){var t=this.yField,e=this.xField,i={},n=this.mergeData;return or(n,(function(n){var r=n[e],a=n[t],s=ir(a)?Math.max.apply(null,a):a;i[r]=i[r]||0,i[r]<s&&(i[r]=s)})),i},r.processAdjust=function(t){var e=cr.merge(t);this.mergeData=e,this._processSymmetric(t),this.mergeData=null},r._processSymmetric=function(t){var e,i=this.xField,n=this.yField,r=this._getMax(n),a=t[0][0];a&&ir(a[n])&&(e=this._getXValuesMax()),or(t,(function(t){or(t,(function(t){var a,s=t[n];if(ir(s)){var o=t[i],h=e[o];a=(r-h)/2;var u=[];or(s,(function(t){u.push(a+t)})),t[n]=u}else a=(r-s)/2,t[n]=[a,s+a]}))}))},n}(Vt);Vt.Symmetric=fr;var gr=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){this.type="polar",this.startAngle=-Math.PI/2,this.endAngle=3*Math.PI/2,this.inner=0,this.innerRadius=0,this.isPolar=!0,this.transposed=!1,this.center=null,this.radius=null},i.init=function(e,i){t.prototype.init.call(this,e,i);var n,r,a=this.inner||this.innerRadius,s=Math.abs(i.x-e.x),o=Math.abs(i.y-e.y);this.startAngle===-Math.PI&&0===this.endAngle?(n=Math.min(s/2,o),r={x:(e.x+i.x)/2,y:e.y}):(n=Math.min(s,o)/2,r={x:(e.x+i.x)/2,y:(e.y+i.y)/2});var h=this.radius;h>0&&h<=1&&(n*=h),this.x={start:this.startAngle,end:this.endAngle},this.y={start:n*a,end:n},this.center=r,this.circleRadius=n},i._convertPoint=function(t){var e=this.center,i=this.transposed,n=i?"y":"x",r=i?"x":"y",a=this.x,s=this.y,o=a.start+(a.end-a.start)*t[n],h=s.start+(s.end-s.start)*t[r];return{x:e.x+Math.cos(o)*h,y:e.y+Math.sin(o)*h}},i._invertPoint=function(t){var e=this.center,i=this.transposed,n=this.x,r=this.y,a=i?"y":"x",s=i?"x":"y",o=[1,0,0,1,0,0];bt.rotate(o,o,n.start);var h=[1,0];Ct.transformMat2d(h,h,o),h=[h[0],h[1]];var u=[t.x-e.x,t.y-e.y];if(Ct.zero(u))return{x:0,y:0};var l=Ct.angleTo(h,u,n.end<n.start);Math.abs(l-2*Math.PI)<.001&&(l=0);var c=Ct.length(u),f=l/(n.end-n.start);f=n.end-n.start>0?f:-f;var g=(c-r.start)/(r.end-r.start),p={};return p[a]=f,p[s]=g,p},e}(kt);kt.Polar=gr;var pr=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){t.prototype._initDefaultCfg.call(this),this.startAngle=-Math.PI/2,this.endAngle=3*Math.PI/2,this.radius=null,this.center=null},i.getOffsetPoint=function(t){var e=this.startAngle,i=e+(this.endAngle-e)*t;return this._getCirclePoint(i)},i._getCirclePoint=function(t,e){var i=this.center;return e=e||this.radius,{x:i.x+Math.cos(t)*e,y:i.y+Math.sin(t)*e}},i.getTextAlignInfo=function(t,e){var i,n=this.getOffsetVector(t,e),r="middle";return n[0]>0?i="left":n[0]<0?i="right":(i="center",n[1]>0?r="top":n[1]<0&&(r="bottom")),{textAlign:i,textBaseline:r}},i.getAxisVector=function(t){var e=this.center,i=this.offsetFactor;return[(t.y-e.y)*i,-1*(t.x-e.x)*i]},i.drawLine=function(t){var e=this.center,i=this.radius,n=this.startAngle,r=this.endAngle;this.getContainer(t.top).addShape("arc",{className:"axis-line",attrs:T({x:e.x,y:e.y,r:i,startAngle:n,endAngle:r},t)})},e}(Fi);Fi.Circle=pr;var dr={min:0,median:.5,max:1},vr=function(){var t=e.prototype;function e(t){this._initDefaultCfg(),A(this,t)}return t._initDefaultCfg=function(){},t._getNormalizedValue=function(t,e){return s(dr[t])?e.scale(t):dr[t]},t.parsePercentPoint=function(t,e){var i=parseFloat(e[0])/100,n=parseFloat(e[1])/100,r=t.start,a=t.end,s=Math.abs(r.x-a.x),o=Math.abs(r.y-a.y);return{x:s*i+Math.min(r.x,a.x),y:o*n+Math.min(r.y,a.y)}},t.parsePoint=function(t,e){var i=this.xScale,n=this.yScales;if(a(e)&&(e=e(i,n)),g(e[0])&&-1!==e[0].indexOf("%")&&!isNaN(e[0].slice(0,-1)))return this.parsePercentPoint(t,e);var r=this._getNormalizedValue(e[0],i),s=this._getNormalizedValue(e[1],n[0]),o=t.convertPoint({x:r,y:s});return this.limitInPlot?r>=0&&r<=1&&s>=0&&s<=1?o:null:o},t.render=function(){},t.repaint=function(){this.remove();var t=this.coord,e=this.container,i=this.canvas;e&&!e.isDestroyed()&&(this.render(t,e),i.draw())},t.remove=function(){var t=this.element;t&&t.remove(!0)},t.changeVisible=function(t){this.visible=t;var e=this.element;e&&(e.set?e.set("visible",t):e.style.display=t?"":"none")},e}(),yr=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){this.type="arc",this.start=[],this.end=[],this.style={stroke:"#999",lineWidth:1}},i.render=function(t,e){var i=this.parsePoint(t,this.start),n=this.parsePoint(t,this.end);if(i&&n){var r=t.center,a=Math.sqrt((i.x-r.x)*(i.x-r.x)+(i.y-r.y)*(i.y-r.y)),s=Math.atan2(i.y-r.y,i.x-r.x),o=Math.atan2(n.y-r.y,n.x-r.x),h=e.addShape("arc",{className:"guide-arc",attrs:T({x:r.x,y:r.y,r:a,startAngle:s,endAngle:o},this.style)});return this.element=h,h}},e}(vr);function mr(t,e){for(var i in e)e.hasOwnProperty(i)&&(t.style[i]=e[i]);return t}function xr(t){var e=document.createElement("div");return t=t.replace(/(^\s*)|(\s*$)/g,""),e.innerHTML=""+t,e.childNodes[0]}vr.Arc=yr;var _r=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){this.type="html",this.position=null,this.alignX="center",this.alignY="middle",this.offsetX=null,this.offsetY=null,this.html=null},i.render=function(t,e){var i=this.parsePoint(t,this.position);if(i){var n=xr(this.html);n=mr(n,{position:"absolute",top:Math.floor(i.y)+"px",left:Math.floor(i.x)+"px",visibility:"hidden"});var r=e.get("canvas").get("el"),a=r.parentNode;a=mr(a,{position:"relative"});var s=xr('<div class="guideWapper" style="position: absolute;top: 0; left: 0;"></div>');a.appendChild(s),s.appendChild(n);var o=r.offsetTop,h=r.offsetLeft,u=this.alignX,l=this.alignY,c=this.offsetX,f=this.offsetY,g=function(t,e,i,n){var r=[];return"left"===t&&"top"===e?(r[0]=0,r[1]=0):"right"===t&&"top"===e?(r[0]=-i,r[1]=0):"left"===t&&"bottom"===e?(r[0]=0,r[1]=Math.floor(-n)):"right"===t&&"bottom"===e?(r[0]=Math.floor(-i),r[1]=Math.floor(-n)):"right"===t&&"middle"===e?(r[0]=Math.floor(-i),r[1]=Math.floor(-n/2)):"left"===t&&"middle"===e?(r[0]=0,r[1]=Math.floor(-n/2)):"center"===t&&"bottom"===e?(r[0]=Math.floor(-i/2),r[1]=Math.floor(-n)):"center"===t&&"top"===e?(r[0]=Math.floor(-i/2),r[1]=0):(r[0]=Math.floor(-i/2),r[1]=Math.floor(-n/2)),r}(u,l,Q(n),tt(n));i.x=i.x+g[0]+h,i.y=i.y+g[1]+o,c&&(i.x+=c),f&&(i.y+=f),mr(n,{top:Math.floor(i.y)+"px",left:Math.floor(i.x)+"px",visibility:"visible"}),this.element=s}},i.remove=function(){var t=this.element;t&&t.parentNode&&t.parentNode.removeChild(t)},e}(vr);vr.Html=_r;var Sr=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){this.type="line",this.start=[],this.end=[],this.style={stroke:"#000",lineWidth:1}},i.render=function(t,e){var i=[];if(i[0]=this.parsePoint(t,this.start),i[1]=this.parsePoint(t,this.end),i[0]&&i[1]){var n=e.addShape("Line",{className:"guide-line",attrs:T({x1:i[0].x,y1:i[0].y,x2:i[1].x,y2:i[1].y},this.style)});return this.element=n,n}},e}(vr);vr.Line=Sr;var Mr=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){this.type="rect",this.start=[],this.end=[],this.style={fill:"#CCD7EB",opacity:.4}},i.render=function(t,e){var i=this.parsePoint(t,this.start),n=this.parsePoint(t,this.end);if(i&&n){var r=e.addShape("rect",{className:"guide-rect",attrs:T({x:Math.min(i.x,n.x),y:Math.min(i.y,n.y),width:Math.abs(n.x-i.x),height:Math.abs(i.y-n.y)},this.style)});return this.element=r,r}},e}(vr);vr.Rect=Mr;var wr=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){this.type="text",this.position=null,this.content=null,this.style={fill:"#000"},this.offsetX=0,this.offsetY=0},i.render=function(t,e){var i=this.position,n=this.parsePoint(t,i);if(n){var r=this.content,a=this.style,s=this.offsetX,o=this.offsetY;s&&(n.x+=s),o&&(n.y+=o);var h=e.addShape("text",{className:"guide-text",attrs:T({x:n.x,y:n.y,text:r},a)});return this.element=h,h}},e}(vr);vr.Text=wr;var br=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){this.type="tag",this.position=null,this.content=null,this.direct="tl",this.autoAdjust=!0,this.offsetX=0,this.offsetY=0,this.side=4,this.background={padding:5,radius:2,fill:"#1890FF"},this.textStyle={fontSize:12,fill:"#fff",textAlign:"center",textBaseline:"middle"},this.withPoint=!0,this.pointStyle={fill:"#1890FF",r:3,lineWidth:1,stroke:"#fff"}},i._getDirect=function(t,e,i,n){var r=this.direct,a=this.side,s=t.get("canvas"),o=s.get("width"),h=s.get("height"),u=e.x,l=e.y,c=r[0],f=r[1];"t"===c&&l-a-n<0?c="b":"b"===c&&l+a+n>h&&(c="t");var g="c"===c?a:0;return"l"===f&&u-g-i<0?f="r":"r"===f&&u+g+i>o?f="l":"c"===f&&(i/2+u+g>o?f="l":u-i/2-g<0&&(f="r")),r=c+f},i.render=function(t,e){var i=this.parsePoint(t,this.position);if(i&&!isNaN(i.x)&&!isNaN(i.y)){var n=this.content,r=this.background,a=this.textStyle,s=[],o=e.addGroup({className:"guide-tag"});if(this.withPoint){var h=o.addShape("Circle",{className:"guide-tag-point",attrs:T({x:i.x,y:i.y},this.pointStyle)});s.push(h)}var u=o.addGroup(),l=u.addShape("text",{className:"guide-tag-text",zIndex:1,attrs:T({x:0,y:0,text:n},a)});s.push(l);var c=l.getBBox(),f=ut(r.padding),g=c.width+f[1]+f[3],p=c.height+f[0]+f[2],d=c.minY-f[0],v=c.minX-f[3],y=u.addShape("rect",{className:"guide-tag-bg",zIndex:-1,attrs:T({x:v,y:d,width:g,height:p},r)});s.push(y);var m,x=this.autoAdjust?this._getDirect(e,i,g,p):this.direct,_=this.side,S=i.x+this.offsetX,M=i.y+this.offsetY,w=ut(r.radius);"tl"===x?(m=[{x:g+v-_-1,y:p+d-1},{x:g+v,y:p+d-1},{x:g+v,y:p+_+d}],w[2]=0,S-=g,M=M-_-p):"cl"===x?(m=[{x:g+v-1,y:(p-_)/2+d-1},{x:g+v-1,y:(p+_)/2+d+1},{x:g+_+v,y:p/2+d}],S=S-g-_,M-=p/2):"bl"===x?(m=[{x:g+v,y:-_+d},{x:g+v-_-1,y:d+1},{x:g+v,y:d+1}],w[1]=0,S-=g,M+=_):"bc"===x?(m=[{x:g/2+v,y:-_+d},{x:(g-_)/2+v-1,y:d+1},{x:(g+_)/2+v+1,y:d+1}],S-=g/2,M+=_):"br"===x?(m=[{x:v,y:d-_},{x:v,y:d+1},{x:v+_+1,y:d+1}],w[0]=0,M+=_):"cr"===x?(m=[{x:v-_,y:p/2+d},{x:v+1,y:(p-_)/2+d-1},{x:v+1,y:(p+_)/2+d+1}],S+=_,M-=p/2):"tr"===x?(m=[{x:v,y:p+_+d},{x:v,y:p+d-1},{x:_+v+1,y:p+d-1}],w[3]=0,M=M-p-_):"tc"===x&&(m=[{x:(g-_)/2+v-1,y:p+d-1},{x:(g+_)/2+v+1,y:p+d-1},{x:g/2+v,y:p+_+d}],S-=g/2,M=M-p-_);var b=u.addShape("Polygon",{className:"guide-tag-side",zIndex:0,attrs:{points:m,fill:r.fill}});return s.push(b),y.attr("radius",w),u.moveTo(S-v,M-d),u.sort(),this.element=o,s}},e}(vr);vr.Tag=br;var Cr=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i._initDefaultCfg=function(){this.type="point",this.position=null,this.offsetX=0,this.offsetY=0,this.style={fill:"#1890FF",r:3,lineWidth:1,stroke:"#fff"}},i.render=function(t,e){var i=this.parsePoint(t,this.position);if(!i)return null;var n=e.addShape("Circle",{className:"guide-point",attrs:T({x:i.x+this.offsetX,y:i.y+this.offsetY},this.style)});return this.element=n,n},e}(vr);vr.Point=Cr;var Pr=function(){var t=e.prototype;function e(t){A(this,this.getDefaultCfg(),t),this._init(),this._renderTitle(),this._renderItems()}return t.getDefaultCfg=function(){return{showTitle:!1,title:null,items:null,titleGap:12,itemGap:10,itemMarginBottom:12,itemFormatter:null,itemWidth:null,wordSpace:6,x:0,y:0,layout:"horizontal",joinString:": "}},t._init=function(){var t=this.parent;if(t){var e=t.addGroup({zIndex:this.zIndex||0});this.container=e;var i=e.addGroup();this.wrapper=i;var n=i.addGroup({className:"itemsGroup"});this.itemsGroup=n}},t._renderTitle=function(t){t=t||this.title;var e=this.titleShape,i=0;if(this.showTitle&&t){if(e&&!e.get("destroyed"))e.attr("text",t);else{var n=this.wrapper,r=this.titleStyle;e=n.addShape("text",{className:"title",attrs:T({x:0,y:0,text:t},r)}),this.titleShape=e}i=e.getBBox().height+this.titleGap}this._titleHeight=i},t._renderItems=function(t){var e=this;(t=t||e.items)&&(e.reversed&&t.reverse(),u(t,(function(t,i){e._addItem(t,i)})),t.length>1&&this._adjustItems(),this._renderBackground())},t._renderBackground=function(){var t=this.background;if(t){var e=this.container,i=this.wrapper.getBBox(),n=i.minX,r=i.minY,a=i.width,s=i.height,o=t.padding||[0,0,0,0],h=T({x:n-(o=ut(o))[3],y:r-o[0],width:a+o[1]+o[3],height:s+o[0]+o[2]},t),u=this.backShape;u?u.attr(h):u=e.addShape("Rect",{zIndex:-1,attrs:h}),this.backShape=u,e.sort()}},t._addItem=function(t){var e,i=this.itemsGroup.addGroup({name:t.name,value:t.value,dataValue:t.dataValue,checked:t.checked}),n=this.unCheckStyle,r=this.unCheckColor,a=this.nameStyle,s=this.valueStyle,o=this.wordSpace,h=t.marker,u=t.value,l=0;if(r&&(n.fill=r),h){var c=T({x:h.radius||3,y:this._titleHeight},h);!1===t.checked&&T(c,n),l+=i.addShape("marker",{className:"item-marker",attrs:c}).getBBox().width+o}var f=t.name;if(f){var g=this.joinString||"";f=u?f+g:f,e=i.addShape("text",{className:"name",attrs:T({x:l,y:this._titleHeight,text:this._formatItemValue(f)},a,!1===t.checked?n:null)})}if(u){var p=l;e&&(p+=e.getBBox().width),i.addShape("text",{className:"value",attrs:T({x:p,y:this._titleHeight,text:u},s,!1===t.checked?n:null)})}return i},t._formatItemValue=function(t){var e=this.itemFormatter;return e&&(t=e.call(this,t)),t},t._getMaxItemWidth=function(){var t=this.itemWidth;if(m(t)||s(t))return t;if("auto"===t){for(var e=this.itemsGroup.get("children"),i=e.length,n=0,r=0;r<i;r++){var a=e[r].getBBox().width;n=Math.max(n,a)}var o=this.maxLength,h=this.itemGap,u=(o-h)/2,l=(o-2*h)/3;return 2===i?Math.max(n,u):n<=l?l:n<=u?u:n}},t._adjustHorizontal=function(){for(var t,e,i=this.maxLength,n=this.itemsGroup.get("children"),r=this.itemGap,a=this.itemMarginBottom,s=this._titleHeight,o=0,h=0,u=this._getMaxItemWidth(),l=[],c=0,f=n.length;c<f;c++){var g=n[c],p=g.getBBox(),d=p.height,v=p.width;e=d+a,(t=u||v)-(i-h)>1e-4&&(o++,h=0),g.moveTo(h,o*e),l.push({x:h,y:o*e+s-d/2,width:1.375*v,height:1.375*d}),h+=t+r}this.legendHitBoxes=l},t._adjustVertical=function(){for(var t,e,i=this.maxLength,n=this.itemsGroup,r=this.itemGap,a=this.itemMarginBottom,s=this.itemWidth,o=this._titleHeight,h=n.get("children"),u=0,l=0,c=0,f=[],g=0,p=h.length;g<p;g++){var d=h[g],v=d.getBBox();t=v.width,e=v.height,m(s)?l=s+r:t>l&&(l=t+r),i-u<e?(u=0,c+=l,d.moveTo(c,0),f.push({x:c,y:o-e/2,width:1.375*t,height:1.375*e})):(d.moveTo(c,u),f.push({x:c,y:u-e/2+o,width:1.375*t,height:1.375*e})),u+=e+a}this.legendHitBoxes=f},t._adjustItems=function(){"horizontal"===this.layout?this._adjustHorizontal():this._adjustVertical()},t.moveTo=function(t,e){this.x=t,this.y=e;var i=this.container;return i&&i.moveTo(t,e),this},t.setItems=function(t){this.clearItems(),this._renderItems(t)},t.setTitle=function(t){this._renderTitle(t)},t.clearItems=function(){this.itemsGroup.clear()},t.getWidth=function(){return this.container.getBBox().width},t.getHeight=function(){return this.container.getBBox().height},t.show=function(){this.container.show()},t.hide=function(){this.container.hide()},t.clear=function(){var t=this.container;t.clear(),t.remove(!0)},e}(),kr=function(){var t=e.prototype;function e(t){A(this,this.getDefaultCfg(),t),this._init();var e=this.content,i=this.x,n=this.y;s(e)||this.updateContent(e),this.updatePosition(i,n)}return t.getDefaultCfg=function(){return{x:0,y:0,content:"",textStyle:{fontSize:12,fill:"#fff",textAlign:"center",textBaseline:"middle",fontFamily:"Arial"},background:{radius:1,fill:"rgba(0, 0, 0, 0.65)",padding:[3,5]},width:0,height:0,className:""}},t._init=function(){var t=this.content,e=this.textStyle,i=this.background,n=this.className,r=this.visible,a=this.context,s=new Cn({context:a,className:n,zIndex:0,visible:r}),o=s.addShape("Text",{className:n+"-text",zIndex:1,attrs:T({text:t,x:0,y:0},e)}),h=s.addShape("Rect",{className:n+"-bg",zIndex:-1,attrs:T({x:0,y:0,width:0,height:0},i)});s.sort(),this.container=s,this.textShape=o,this.backgroundShape=h},t._getBBox=function(){var t=this.textShape,e=this.background,i=t.getBBox(),n=ut(e.padding),r=i.width+n[1]+n[3],a=i.height+n[0]+n[2];return{x:i.minX-n[3],y:i.minY-n[0],width:r,height:a}},t.updateContent=function(t){var e=this.textShape,i=this.backgroundShape;if(!s(t)){h(t)||(t={text:t}),e.attr(t);var n=this._getBBox(),r=n.x,a=n.y,o=n.width,u=n.height,l=this.width||o,c=this.height||u;i.attr({x:r,y:a,width:l,height:c}),this._width=l,this._height=c,this.content=t.text}},t.updatePosition=function(t,e){var i=this.container,n=this._getBBox(),r=n.x,a=n.y;i.moveTo(t-r,e-a),this.x=t-r,this.y=e-a},t.getWidth=function(){return this._width},t.getHeight=function(){return this._height},t.show=function(){this.container.show()},t.hide=function(){this.container.hide()},t.clear=function(){var t=this.container;t.clear(),t.remove(!0),this.container=null,this.textShape=null,this.backgroundShape=null},e}(),Tr=function(){var t=e.prototype;function e(t){A(this,this.getDefaultCfg(),t);var e=this.frontPlot;if(!this.custom){var i=new Pr(T({parent:e,zIndex:3},t));this.container=i;var n=this.fixed,r=this.background;n||(this.tooltipArrow=e.addShape("Polygon",{className:"tooltip-arrow",visible:!1,zIndex:2,attrs:T({points:[]},r)}))}if(this.showXTip){var a=this.xTipBackground,s=this.xTipTextStyle,o=new kr({context:e.get("context"),className:"xTip",background:a,textStyle:s,visible:!1});e.add(o.container),this.xTipBox=o}if(this.showYTip){var h=this.yTipBackground,u=this.yTipTextStyle,l=new kr({context:e.get("context"),className:"yTip",background:h,textStyle:u,visible:!1});e.add(l.container),this.yTipBox=l}this.showCrosshairs&&this._renderCrosshairs(),e.sort()}return t.getDefaultCfg=function(){return{showCrosshairs:!1,crosshairsStyle:{stroke:"rgba(0, 0, 0, 0.25)",lineWidth:1},crosshairsType:"y",showXTip:!1,showYTip:!1,xTip:null,xTipBackground:{radius:1,fill:"rgba(0, 0, 0, 0.65)",padding:[3,5]},xTipTextStyle:{fontSize:12,fill:"#fff",textAlign:"center",textBaseline:"middle"},yTip:null,yTipBackground:{radius:1,fill:"rgba(0, 0, 0, 0.65)",padding:[3,5]},yTipTextStyle:{fontSize:12,fill:"#fff",textAlign:"center",textBaseline:"middle"},background:null,layout:"horizontal",offsetX:0,offsetY:0}},t.setContent=function(t,e){if(this.title=t,this.items=e,!this.custom){var i=this.container;i.setTitle(t),i.setItems(e)}},t.setYTipContent=function(t){var e=this.yTip;t=a(e)?e(t):T({text:t},e),this.yTipBox&&this.yTipBox.updateContent(t)},t.setYTipPosition=function(t){var e=this.plotRange,i=this.crosshairsShapeX;if(this.showYTip){var n=this.yTipBox,r=n.getHeight(),a=n.getWidth(),s=e.tl.x-a,o=t-r/2;o<=e.tl.y&&(o=e.tl.y),o+r>=e.br.y&&(o=e.br.y-r),s<0&&(s=e.tl.x,i&&i.attr("x1",e.tl.x+a)),n.updatePosition(s,o)}},t.setXTipContent=function(t){var e=this.xTip;t=a(e)?e(t):T({text:t},e),this.xTipBox&&this.xTipBox.updateContent(t)},t.setXTipPosition=function(t){var e=this.showXTip,i=this.canvas,n=this.plotRange,r=this.xTipBox,a=this.crosshairsShapeY;if(e){var s=i.get("height"),o=r.getWidth(),h=r.getHeight(),u=t-o/2,l=n.br.y;u<=n.tl.x&&(u=n.tl.x),u+o>=n.tr.x&&(u=n.tr.x-o),s-l<h&&(l-=h),r.updatePosition(u,l),a&&a.attr("y1",l)}},t.setXCrosshairPosition=function(t){this.crosshairsShapeX&&this.crosshairsShapeX.moveTo(0,t)},t.setYCrosshairPosition=function(t){this.crosshairsShapeY&&this.crosshairsShapeY.moveTo(t,0)},t.setPosition=function(t){var e=this.container,i=this.plotRange,n=this.offsetX,r=this.offsetY,a=this.fixed,s=this.tooltipArrow;if(e){var o,h=e.container.getBBox(),u=h.minX,l=h.minY,c=h.width,f=h.height,g=i.tl,p=i.tr,d=0,v=g.y-f-4+r;if(v<0&&(v=0),a)d=(g.x+p.x)/2-c/2+n;else if((d=(o=t.length>1?(t[0].x+t[t.length-1].x)/2:t[0].x)-c/2+n)<g.x&&(d=g.x),d+c>p.x&&(d=p.x-c),s){var y=v+f;s.attr("points",[{x:o-3,y:y},{x:o+3,y:y},{x:o,y:y+4}]);var m=e.backShape,x=ut(m.attr("radius"));o===g.x?(x[3]=0,s.attr("points",[{x:g.x,y:y},{x:g.x+4,y:y},{x:g.x,y:y+4}])):o===p.x&&(x[2]=0,s.attr("points",[{x:p.x-4,y:y},{x:p.x,y:y},{x:p.x,y:y+4}])),m.attr("radius",x)}e.moveTo(d-u,v-l)}},t.setMarkers=function(t){void 0===t&&(t={});var e=t,i=e.items,n=e.style,r=e.type,a=this._getMarkerGroup(r);if("circle"===r)for(var s=0,o=i.length;s<o;s++){var h=i[s];a.addShape("marker",{className:"tooltip-circle-marker",attrs:T({x:h.x,y:h.y,stroke:h.color},n)})}else a.addShape("rect",{className:"tooltip-rect-marker",attrs:n})},t.clearMarkers=function(){var t=this.markerGroup;t&&t.clear()},t.show=function(){var t=this.crosshairsShapeX,e=this.crosshairsShapeY,i=this.markerGroup,n=this.container,r=this.tooltipArrow,a=this.xTipBox,s=this.yTipBox,o=this.canvas;t&&t.show(),e&&e.show(),i&&i.show(),n&&n.show(),r&&r.show(),a&&a.show(),s&&s.show(),o.draw()},t.hide=function(){var t=this.crosshairsShapeX,e=this.crosshairsShapeY,i=this.markerGroup,n=this.container,r=this.tooltipArrow,a=this.xTipBox,s=this.yTipBox;t&&t.hide(),e&&e.hide(),i&&i.hide(),n&&n.hide(),r&&r.hide(),a&&a.hide(),s&&s.hide()},t.destroy=function(){var t=this.crosshairsShapeX,e=this.crosshairsShapeY,i=this.markerGroup,n=this.container,r=this.tooltipArrow,a=this.xTipBox,s=this.yTipBox;t&&t.remove(!0),e&&e.remove(!0),i&&i.remove(!0),r&&r.remove(!0),n&&n.clear(),a&&a.clear(),s&&s.clear(),this.destroyed=!0},t._getMarkerGroup=function(t){var e=this.markerGroup;return e?e.clear():("circle"===t?(e=this.frontPlot.addGroup({zIndex:1}),this.frontPlot.sort()):e=this.backPlot.addGroup(),this.markerGroup=e),e},t._renderCrosshairs=function(){var t=this.crosshairsType,e=this.crosshairsStyle,i=this.frontPlot,n=this.plotRange,r=n.tl,a=n.br;lt(t,"x")&&(this.crosshairsShapeX=i.addShape("Line",{className:"tooltip-crosshairs-x",zIndex:0,visible:!1,attrs:T({x1:r.x,y1:0,x2:a.x,y2:0},e)})),lt(t,"y")&&(this.crosshairsShapeY=i.addShape("Line",{className:"tooltip-crosshairs-y",zIndex:0,visible:!1,attrs:T({x1:0,y1:a.y,x2:0,y2:r.y},e)}))},e}();function Dr(t){var e=t.getAttr("color");if(e){var i=e.getScale(e.type);if(i.isLinear)return i}var n=t.getXScale(),r=t.getYScale();return r||n}function Ar(t,e){var i,n,r=t._getGroupScales();if(r.length&&u(r,(function(t){return n=t,!1})),n){var a=n.field;i=n.getText(e[a])}else{var s=Dr(t);i=s.alias||s.field}return i}function Ir(t,e){var i=Dr(t);return i.getText(e[i.field])}function Yr(t,e){var i=t.getAttr("position").getFields()[0],n=t.get("scales")[i];return n.getText(e[n.field])}function Or(t){var e=[];return u(t,(function(t){var i=function(t,e){var i=-1;return u(t,(function(t,n){if(t.title===e.title&&t.name===e.name&&t.value===e.value&&t.color===e.color)return i=n,!1})),i}(e,t);-1===i?e.push(t):e[i]=t})),e}vt.tooltip=A({triggerOn:"press",triggerOff:"pressend",alwaysShow:!1,showTitle:!1,showCrosshairs:!1,crosshairsStyle:{stroke:"rgba(0, 0, 0, 0.25)",lineWidth:1},showTooltipMarker:!0,background:{radius:1,fill:"rgba(0, 0, 0, 0.65)",padding:[3,5]},titleStyle:{fontSize:12,fill:"#fff",textAlign:"start",textBaseline:"top"},nameStyle:{fontSize:12,fill:"rgba(255, 255, 255, 0.65)",textAlign:"start",textBaseline:"middle"},valueStyle:{fontSize:12,fill:"#fff",textAlign:"start",textBaseline:"middle"},showItemMarker:!0,itemMarkerStyle:{radius:3,symbol:"circle",lineWidth:1,stroke:"#fff"},layout:"horizontal",snap:!1},vt.tooltip||{});var Er=function(){function t(t){var e=this;yt(this,"handleShowEvent",(function(t){var i=e.chart;if(e.enable){var n=i.get("plotRange"),r=ot(t,i);if(On(r,n)||e._tooltipCfg.alwaysShow){var a=e.timeStamp,s=+new Date;s-a>16&&(e.showTooltip(r),e.timeStamp=s)}else e.hideTooltip()}})),yt(this,"handleHideEvent",(function(){e.enable&&e.hideTooltip()})),this.enable=!0,this.cfg={},this.tooltip=null,this.chart=null,this.timeStamp=0,T(this,t);var i=this.chart.get("canvas");this.canvas=i,this.canvasDom=i.get("el")}var e=t.prototype;return e._setCrosshairsCfg=function(){var t=this.chart,e=T({},vt.tooltip),i=t.get("geoms"),n=[];u(i,(function(t){var e=t.get("type");-1===n.indexOf(e)&&n.push(e)}));var r=t.get("coord").type;return!i.length||"cartesian"!==r&&"rect"!==r||1===n.length&&-1!==["line","area","path","point"].indexOf(n[0])&&T(e,{showCrosshairs:!0}),e},e._getMaxLength=function(t){void 0===t&&(t={});var e=t,i=e.layout,n=e.plotRange;return"horizontal"===i?n.br.x-n.bl.x:n.bl.y-n.tr.y},e.render=function(){if(!this.tooltip){var t=this.chart,e=t.get("canvas"),i=t.get("frontPlot").addGroup({className:"tooltipContainer",zIndex:10}),n=t.get("backPlot").addGroup({className:"tooltipContainer"}),r=t.get("plotRange"),a=t.get("coord"),s=this._setCrosshairsCfg(),o=this.cfg,h=A({plotRange:r,frontPlot:i,backPlot:n,canvas:e,fixed:a.transposed||a.isPolar},s,o);h.maxLength=this._getMaxLength(h),this._tooltipCfg=h;var u=new Tr(h);this.tooltip=u,h.alwaysShow&&this.prePoint&&this.showTooltip(this.prePoint),this.bindEvents()}},e.clear=function(){var t=this.tooltip;t&&(t.destroy(),this.unBindEvents()),this.tooltip=null,this._lastActive=null},e._getTooltipMarkerStyle=function(t){void 0===t&&(t={});var e=t,i=e.type,n=e.items,r=this._tooltipCfg;if("rect"===i){var a,s,o,h,u=this.chart,l=u.get("plotRange"),c=l.tl,f=l.br,g=u.get("coord"),p=n[0],d=n[n.length-1],v=p.width;g.transposed?(a=c.x,s=d.y-.75*v,o=f.x-c.x,h=p.y-d.y+1.5*v):(a=p.x-.75*v,s=c.y,o=d.x-p.x+1.5*v,h=f.y-c.y),t.style=T({x:a,y:s,width:o,height:h,fill:"#CCD6EC",opacity:.3},r.tooltipMarkerStyle)}else t.style=T({radius:4,fill:"#fff",lineWidth:2},r.tooltipMarkerStyle);return t},e._setTooltip=function(t,e,i){void 0===i&&(i={}),this.prePoint=t;var n=this._lastActive,r=this.tooltip,a=this._tooltipCfg;e=Or(e);var s=this.chart,o=s.get("coord"),h=s.getYScales()[0],u=a.snap;if(!1===u&&h.isLinear){var l,c,f=o.invertPoint(t);On(t,s.get("plotRange"))&&(o.transposed?(l=h.invert(f.x),c=t.x,r.setXTipContent(l),r.setXTipPosition(c),r.setYCrosshairPosition(c)):(l=h.invert(f.y),c=t.y,r.setYTipContent(l),r.setYTipPosition(c),r.setXCrosshairPosition(c)))}if(a.onShow&&a.onShow({x:t.x,y:t.y,tooltip:r,items:e,tooltipMarkerCfg:i}),g=n,p=e,JSON.stringify(g)!==JSON.stringify(p)){var g,p;this._lastActive=e;var d=a.onChange;d&&d({x:t.x,y:t.y,tooltip:r,items:e,tooltipMarkerCfg:i});var v=e[0],y=v.title||v.name,m=v.x;if(e.length>1&&(m=(e[0].x+e[e.length-1].x)/2),r.setContent(y,e,o.transposed),r.setPosition(e,t),o.transposed){var x=v.y;e.length>1&&(x=(e[0].y+e[e.length-1].y)/2),r.setYTipContent(y),r.setYTipPosition(x),r.setXCrosshairPosition(x),u&&(r.setXTipContent(v.value),r.setXTipPosition(m),r.setYCrosshairPosition(m))}else r.setXTipContent(y),r.setXTipPosition(m),r.setYCrosshairPosition(m),u&&(r.setYTipContent(v.value),r.setYTipPosition(v.y),r.setXCrosshairPosition(v.y));var _=i.items;a.showTooltipMarker&&_.length?(i=this._getTooltipMarkerStyle(i),r.setMarkers(i)):r.clearMarkers(),r.show()}else{!1===u&&(lt(a.crosshairsType,"y")||a.showYTip)&&this.chart.get("canvas").draw()}},e.showTooltip=function(t){var e,i,n=this.chart,r=[],a=[],s=this._tooltipCfg,h=s.showItemMarker,l=s.itemMarkerStyle,c=s.alwaysShow;h&&(i=l);var f=n.get("geoms"),g=n.get("coord");if(u(f,(function(n){if(n.get("visible")){var s=n.get("type"),h=n.getSnapRecords(t),l=n.get("adjust");if("interval"===s&&l&&"symmetric"===l.type)return;u(h,(function(t){var h=t.x,u=t.y,l=t._origin,c=t.color;if((h||!isNaN(h))&&(u||!isNaN(u))){var f={x:h,y:o(u)?u[1]:u,color:c||vt.defaultColor,origin:l,name:Ar(n,l),value:Ir(n,l),title:Yr(n,l)};i&&(f.marker=T({fill:c||vt.defaultColor},i)),a.push(f),-1!==["line","area","path"].indexOf(s)?(e="circle",r.push(f)):"interval"!==s||"cartesian"!==g.type&&"rect"!==g.type||(e="rect",f.width=n.getSize(t._origin),r.push(f))}}))}})),a.length){var p={items:r,type:e};this._setTooltip(t,a,p)}else c||this.hideTooltip()},e.hideTooltip=function(){var t=this._tooltipCfg;this._lastActive=null;var e=this.tooltip;e&&(e.hide(),t.onHide&&t.onHide({tooltip:e}),this.chart.get("canvas").draw())},e._handleEvent=function(t,e,i){var n=this.canvas;u([].concat(t),(function(t){"bind"===i?n.on(t,e):n.off(t,e)}))},e.bindEvents=function(){var t=this._tooltipCfg,e=t.triggerOn,i=t.triggerOff,n=t.alwaysShow;e&&this._handleEvent(e,this.handleShowEvent,"bind"),n||this._handleEvent(i,this.handleHideEvent,"bind")},e.unBindEvents=function(){var t=this._tooltipCfg,e=t.triggerOn,i=t.triggerOff,n=t.alwaysShow;e&&this._handleEvent(e,this.handleShowEvent,"unBind"),n||this._handleEvent(i,this.handleHideEvent,"unBind")},t}();function Nr(t){var e=new Er({chart:t});t.set("tooltipController",e),t.tooltip=function(t,i){return h(t)&&(i=t,t=!0),e.enable=t,i&&(e.cfg=i),this}}function Fr(t){var e=t.get("tooltipController");e.render(),t.showTooltip=function(t){return e.showTooltip(t),this},t.hideTooltip=function(){return e.hideTooltip(),this}}function zr(t){t.get("tooltipController").clear()}var Br={init:Nr,afterGeomDraw:Fr,clearInner:zr},Xr=Object.freeze({__proto__:null,init:Nr,afterGeomDraw:Fr,clearInner:zr,default:Br});vt.guide=A({line:{style:{stroke:"#a3a3a3",lineWidth:1},top:!0},text:{style:{fill:"#787878",textAlign:"center",textBaseline:"middle"},offsetX:0,offsetY:0,top:!0},rect:{style:{fill:"#fafafa"},top:!1},arc:{style:{stroke:"#a3a3a3"},top:!0},html:{offsetX:0,offsetY:0,alignX:"center",alignY:"middle"},tag:{top:!0,offsetX:0,offsetY:0,side:4,background:{padding:5,radius:2,fill:"#1890FF"},textStyle:{fontSize:12,fill:"#fff",textAlign:"center",textBaseline:"middle"}},point:{top:!0,offsetX:0,offsetY:0,style:{fill:"#fff",r:3,lineWidth:2,stroke:"#1890ff"}}},vt.guide||{});var Lr=function(){function t(t){this.guides=[],this.xScale=null,this.yScales=null,this.guideShapes=[],T(this,t)}var e=t.prototype;return e._toString=function(t){return a(t)&&(t=t(this.xScale,this.yScales)),t=t.toString()},e._getId=function(t,e){var i=e.id;if(!i){var n=e.type;i="arc"===n||"line"===n||"rect"===n?this._toString(e.start)+"-"+this._toString(e.end):this._toString(e.position)}return i},e.paint=function(t){var e=this,i=e.chart,n=e.guides,r=e.xScale,a=e.yScales,s=[];u(n,(function(n,o){var h;n.xScale=r,n.yScales=a,"regionFilter"===n.type?n.chart=i:h=n.top?e.frontPlot:e.backPlot,n.coord=t,n.container=h,n.canvas=i.get("canvas");var u=n.render(t,h);if(u){var l=e._getId(u,n);[].concat(u).forEach((function(t){t._id=t.get("className")+"-"+l,t.set("index",o),s.push(t)}))}})),e.guideShapes=s},e.clear=function(){return this.reset(),this.guides=[],this},e.reset=function(){u(this.guides,(function(t){t.remove()}))},e._createGuide=function(t,e){var i=M(t),n=new vr[i](A({},vt.guide[t],e));return this.guides.push(n),n},e.line=function(t){return void 0===t&&(t={}),this._createGuide("line",t)},e.text=function(t){return void 0===t&&(t={}),this._createGuide("text",t)},e.arc=function(t){return void 0===t&&(t={}),this._createGuide("arc",t)},e.html=function(t){return void 0===t&&(t={}),this._createGuide("html",t)},e.rect=function(t){return void 0===t&&(t={}),this._createGuide("rect",t)},e.tag=function(t){return void 0===t&&(t={}),this._createGuide("tag",t)},e.point=function(t){return void 0===t&&(t={}),this._createGuide("point",t)},e.regionFilter=function(t){return void 0===t&&(t={}),this._createGuide("regionFilter",t)},t}();function jr(t){var e=new Lr({frontPlot:t.get("frontPlot").addGroup({zIndex:20,className:"guideContainer"}),backPlot:t.get("backPlot").addGroup({className:"guideContainer"})});t.set("guideController",e),t.guide=function(){return e}}function Gr(t){var e=t.get("guideController");if(e.guides.length){var i=t.getXScale(),n=t.getYScales(),r=t.get("coord");e.xScale=i,e.yScales=n,e.chart=t,e.paint(r)}}function Rr(t){t.get("guideController").clear()}function Hr(t){t.get("guideController").reset()}var Wr={init:jr,afterGeomDraw:Gr,clear:Rr,repaint:Hr},Vr=Object.freeze({__proto__:null,init:jr,afterGeomDraw:Gr,clear:Rr,repaint:Hr,default:Wr}),qr={itemMarginBottom:12,itemGap:10,showTitle:!1,titleStyle:{fontSize:12,fill:"#808080",textAlign:"start",textBaseline:"top"},nameStyle:{fill:"#808080",fontSize:12,textAlign:"start",textBaseline:"middle"},valueStyle:{fill:"#000000",fontSize:12,textAlign:"start",textBaseline:"middle"},unCheckStyle:{fill:"#bfbfbf"},itemWidth:"auto",wordSpace:6,selectedMode:"multiple"};vt.legend=A({common:qr,right:T({position:"right",layout:"vertical"},qr),left:T({position:"left",layout:"vertical"},qr),top:T({position:"top",layout:"horizontal"},qr),bottom:T({position:"bottom",layout:"horizontal"},qr)},vt.legend||{});var Zr=function(){function t(t){var e=this;yt(this,"handleEvent",(function(t){var i=e;var n=i.chart,r=ot(t,n),a=function(t,e){var n=null;return u(i.legends,(function(i){u(i,(function(i){var r=i.itemsGroup,a=i.legendHitBoxes,s=r.get("children");if(s.length){var o=i.x,h=i.y;u(a,(function(r,a){if(t>=r.x+o&&t<=r.x+r.width+o&&e>=r.y+h&&e<=r.height+r.y+h)return n={clickedItem:s[a],clickedLegend:i},!1}))}}))})),n}(r.x,r.y);if(a&&!1!==a.clickedLegend.clickable){var s=a.clickedItem,o=a.clickedLegend;if(o.onClick)t.clickedItem=s,o.onClick(t);else if(!o.custom){var h=s.get("checked"),l=s.get("dataValue"),c=o.filteredVals,f=o.field;"single"===o.selectedMode?n.filter(f,(function(t){return t===l})):(h?c.push(l):G(c,l),n.filter(f,(function(t){return-1===c.indexOf(t)}))),n.repaint()}}})),this.legendCfg={},this.enable=!0,this.position="top",T(this,t);var i=this.chart;this.canvasDom=i.get("canvas").get("el"),this.clear()}var e=t.prototype;return e.addLegend=function(t,e,i){var n=this.legendCfg,r=t.field,a=n[r];if(!1===a)return null;if(a&&a.custom)this.addCustomLegend(r);else{var s=n.position||this.position;a&&a.position&&(s=a.position),t.isCategory&&this._addCategoryLegend(t,e,s,i)}},e.addCustomLegend=function(t){var e=this.legendCfg;t&&e[t]&&(e=e[t]);var i=e.position||this.position,n=this.legends;n[i]=n[i]||[];var r=e.items;if(!r)return null;var a=this.container;u(r,(function(t){f(t.marker)?t.marker.radius=t.marker.radius||3:t.marker={symbol:t.marker||"circle",fill:t.fill,radius:3},t.checked=!!s(t.checked)||t.checked,t.name=t.name||t.value}));var o=new Pr(A({},vt.legend[i],e,{maxLength:this._getMaxLength(i),items:r,parent:a}));n[i].push(o)},e.clear=function(){u(this.legends,(function(t){u(t,(function(t){t.clear()}))})),this.legends={},this.unBindEvents()},e._isFiltered=function(t,e,i){var n=!1;return u(e,(function(e){if(n=n||t.getText(e)===t.getText(i))return!1})),n},e._getMaxLength=function(t){var e=this.chart,i=ut(e.get("appendPadding"));return"right"===t||"left"===t?e.get("height")-(i[0]+i[2]):e.get("width")-(i[1]+i[3])},e._addCategoryLegend=function(t,e,i,n){var r=this,a=r.legendCfg,s=r.legends,o=r.container,h=r.chart,l=t.field;s[i]=s[i]||[];var c="circle";a[l]&&a[l].marker?c=a[l].marker:a.marker&&(c=a.marker),u(e,(function(e){f(c)?T(e.marker,c):e.marker.symbol=c,n&&(e.checked=!r._isFiltered(t,n,e.dataValue))})),h.get("legendItems")[l]=e;var g=A({},vt.legend[i],a[l]||a,{maxLength:r._getMaxLength(i),items:e,field:l,filteredVals:n,parent:o});g.showTitle&&A(g,{title:t.alias||t.field});var p=new Pr(g);return s[i].push(p),p},e._alignLegend=function(t,e,i){var n=this.plotRange,r=n.tl,a=n.bl,s=this.chart,o=t.offsetX||0,h=t.offsetY||0,u=s.get("width"),l=s.get("height"),c=ut(s.get("appendPadding")),f=t.getHeight(),g=t.getWidth(),p=0,d=0;if("left"===i||"right"===i){var v=t.verticalAlign||"middle",y=Math.abs(r.y-a.y);p="left"===i?c[3]:u-g-c[1],d=(y-f)/2+r.y,"top"===v?d=r.y:"bottom"===v&&(d=a.y-f),e&&(d=e.get("y")-f-12)}else{var m=t.align||"left";if(p=c[3],"center"===m?p=u/2-g/2:"right"===m&&(p=u-(g+c[1])),d="top"===i?c[0]+Math.abs(t.container.getBBox().minY):l-f,e){var x=e.getWidth();p=e.x+x+12}}"bottom"===i&&h>0&&(h=0),"right"===i&&o>0&&(o=0),t.moveTo(p+o,d+h)},e.alignLegends=function(){var t=this;return u(t.legends,(function(e,i){u(e,(function(n,r){var a=e[r-1];t._alignLegend(n,a,i)}))})),t},e.bindEvents=function(){var t=this.legendCfg.triggerOn||"touchstart";nt(this.canvasDom,t,this.handleEvent)},e.unBindEvents=function(){var t=this.legendCfg.triggerOn||"touchstart";rt(this.canvasDom,t,this.handleEvent)},t}();function Ur(t){var e=new Zr({container:t.get("backPlot").addGroup(),plotRange:t.get("plotRange"),chart:t});t.set("legendController",e),t.legend=function(t,i){var n=e.legendCfg;return e.enable=!0,b(t)?(e.enable=t,n=i||{}):h(t)?n=t:n[t]=i,e.legendCfg=n,this}}function Jr(t){var e=t.get("legendController");if(!e.enable)return null;var i=e.legendCfg,n=e.container;if(i&&i.custom)e.addCustomLegend();else{var r=t.getLegendItems(),a=t.get("scales"),s=t.get("filters");u(r,(function(t,i){var n,r=a[i],o=r.values;n=s&&s[i]?o.filter((function(t){return!s[i](t)})):[],e.addLegend(r,t,n)}))}i&&!1!==i.clickable&&e.bindEvents();var o=e.legends,h={top:0,right:0,bottom:0,left:0};u(o,(function(e,i){var n=0;u(e,(function(t){var e=t.getWidth(),r=t.getHeight();"top"===i||"bottom"===i?(n=Math.max(n,r),t.offsetY>0&&(n+=t.offsetY)):(n=Math.max(n,e),t.offsetX>0&&(n+=t.offsetX))})),h[i]=n+function(t,e){var i=0;switch(e=ut(e),t){case"top":i=e[0];break;case"right":i=e[1];break;case"bottom":i=e[2];break;case"left":i=e[3]}return i}(i,t.get("appendPadding"))})),t.set("legendRange",h),Object.keys(o).length?n.set("ariaLabel",dt.legend.prefix):n.set("ariaLabel",null)}function $r(t){t.get("legendController").alignLegends()}function Kr(t){t.get("legendController").clear(),t.set("legendRange",null)}var Qr={init:Ur,beforeGeomDraw:Jr,afterGeomDraw:$r,clearInner:Kr},ta=Object.freeze({__proto__:null,init:Ur,beforeGeomDraw:Jr,afterGeomDraw:$r,clearInner:Kr,default:Qr}),ea="object"==typeof performance&&performance.now?performance:Date,ia=function(){function t(){this.anims=[],this.time=null,this.playing=!1,this.canvas=[]}var e=t.prototype;return e.play=function(){var t=this;t.time=ea.now(),t.playing=!0,Pn((function e(){t.playing&&(Pn(e),t.update())}))},e.stop=function(){this.playing=!1,this.time=null,this.canvas=[]},e.pushAnim=function(t){this.playing||this.play();var e=t.delay,i=t.duration,n=this.time+e,r=n+i;t.startTime=n,t.endTime=r,this.anims.push(t)},e.update=function(){var t=ea.now();if(this.canvas=[],this.anims.length){for(var e=0;e<this.anims.length;e++){var i=this.anims[e];if(!(t<i.startTime||i.hasEnded)){var n=i.shape;if(n.get("destroyed"))this.anims.splice(e,1),e--;else{var r=i.startState,a=i.endState,s=i.interpolate,o=i.duration;t>=i.startTime&&!i.hasStarted&&(i.hasStarted=!0,i.onStart&&i.onStart());var h=(t-i.startTime)/o;if(h=Math.max(0,Math.min(h,1)),h=i.easing(h),i.onFrame)i.onFrame(h);else for(var u in s){var l=(0,s[u])(h),c=void 0;if("points"===u){c=[];for(var f=Math.max(r.points.length,a.points.length),g=0;g<f;g+=2)c.push({x:l[g],y:l[g+1]})}else c=l;n._attrs.attrs[u]=c,n._attrs.bbox=null}var p=n.get("canvas");-1===this.canvas.indexOf(p)&&this.canvas.push(p),i.onUpdate&&i.onUpdate(h),t>=i.endTime&&!i.hasEnded&&(i.hasEnded=!0,i.onEnd&&i.onEnd()),1===h&&(this.anims.splice(e,1),e--)}}}this.canvas.map((function(t){return t.draw(),t})),this.time=ea.now()}else this.stop()},t}();function na(t){return t}function ra(t){return 1-aa(1-t)}function aa(t){return(t/=1)<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375}var sa=Object.freeze({__proto__:null,linear:na,quadraticIn:function(t){return t*t},quadraticOut:function(t){return t*(2-t)},quadraticInOut:function(t){return(t*=2)<1?.5*t*t:-.5*(--t*(t-2)-1)},cubicIn:function(t){return t*t*t},cubicOut:function(t){return--t*t*t+1},cubicInOut:function(t){return(t*=2)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},elasticIn:function(t){var e,i=.1;return 0===t?0:1===t?1:(!i||i<1?(i=1,e=.1):e=.4/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/.4))},elasticOut:function(t){var e,i=.1;return 0===t?0:1===t?1:(!i||i<1?(i=1,e=.1):e=.4/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/.4)+1)},elasticInOut:function(t){var e,i=.1,n=.4;return 0===t?0:1===t?1:(!i||i<1?(i=1,e=.1):e=n/(2*Math.PI)*Math.asin(1/i),(t*=2)<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},backIn:function(t){var e=1.70158;return t*t*((e+1)*t-e)},backOut:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},backInOut:function(t){var e=2.5949095;return(t*=2)<1?t*t*((e+1)*t-e)*.5:.5*((t-=2)*t*((e+1)*t+e)+2)},bounceIn:ra,bounceOut:aa,bounceInOut:function(t){return t<.5?.5*ra(2*t):.5*aa(2*t-1)+.5}});function oa(t){for(var e=[],i=0,n=t.length;i<n;i++)t[i]&&(e.push(t[i].x),e.push(t[i].y));return e}function ha(t,e){return e-=t=+t,function(i){return t+e*i}}function ua(t,e){var i,n=e?e.length:0,r=t?Math.min(n,t.length):0,a=new Array(r),s=new Array(n);for(i=0;i<r;++i)a[i]=ha(t[i],e[i]);for(;i<n;++i)s[i]=e[i];return function(t){for(i=0;i<r;++i)s[i]=a[i](t);return s}}var la=function(){function t(t,e,i){this.hasStarted=!1,this.hasEnded=!1,this.shape=t,this.source=e,this.timeline=i,this.animate=null}var e=t.prototype;return e.to=function(t){void 0===t&&(t={});var e,i=t.delay||0,n=t.attrs||{},r=t.duration||1e3;e="function"==typeof t.easing?t.easing:sa[t.easing]||na;var a={shape:this.shape,delay:i,duration:r,easing:e},s={};for(var o in n){var h=this.source[o],u=n[o];"points"===o?(h=oa(h),u=oa(u),s.points=ua(h,u),this.source.points=h,n.points=u):"matrix"===o?s.matrix=ua(h,u):s[o]=ha(h,u)}return a.interpolate=s,a.startState=this.source,a.endState=n,this.timeline.pushAnim(a),this.animate=a,this},e.onFrame=function(t){return this.animate&&(this.animate.onFrame=function(e){t(e)}),this},e.onStart=function(t){return this.animate&&(this.animate.onStart=function(){t()}),this},e.onUpdate=function(t){return this.animate&&(this.animate.onUpdate=function(e){t(e)}),this},e.onEnd=function(t){return this.animate&&(this.animate.onEnd=function(){t()}),this},t}(),ca={appear:{duration:450,easing:"quadraticOut"},update:{duration:300,easing:"quadraticOut"},enter:{duration:300,easing:"quadraticOut"},leave:{duration:350,easing:"quadraticIn"}},fa={defaultCfg:{},Action:{},getAnimation:function(t,e,i){var n=this.defaultCfg[t];if(n){var r=n[i];if(a(r))return r(e)}return!1},getAnimateCfg:function(t,e){var i=ca[e],n=this.defaultCfg[t];return n&&n.cfg&&n.cfg[e]?A({},i,n.cfg[e]):i},registerAnimation:function(t,e){var i;this.Action||(this.Action={}),this.Action=mt({},this.Action,((i={})[t]=e,i))}};function ga(t,e,i){var n;t.apply(e);var r=e[0],a=e[1];if("x"===i){t.transform([["t",r,a],["s",.01,1],["t",-r,-a]]);var s=t.getMatrix();n=bt.transform(s,[["t",r,a],["s",100,1],["t",-r,-a]])}else if("y"===i){t.transform([["t",r,a],["s",1,.01],["t",-r,-a]]);var o=t.getMatrix();n=bt.transform(o,[["t",r,a],["s",1,100],["t",-r,-a]])}else if("xy"===i){t.transform([["t",r,a],["s",.01,.01],["t",-r,-a]]);var h=t.getMatrix();n=bt.transform(h,[["t",r,a],["s",100,100],["t",-r,-a]])}return n}function pa(t,e,i,n){var r=t._id,s=function(t,e,i){var n={};return t.delay&&(n.delay=a(t.delay)?t.delay(e,i):t.delay),n.easing=t.easing,n.duration=t.duration,n.delay=t.delay,n}(i,t.get("index"),r),o=s.easing,h=s.delay,u=s.duration,l=t.animate().to({attrs:e,duration:u,delay:h,easing:o});n&&l.onEnd((function(){n()}))}function da(t,e){var i=s(t.attr("fillOpacity"))?1:t.attr("fillOpacity"),n=s(t.attr("strokeOpacity"))?1:t.attr("strokeOpacity");t.attr("fillOpacity",0),t.attr("strokeOpacity",0),pa(t,{fillOpacity:i,strokeOpacity:n},e)}var va=Object.freeze({__proto__:null,fadeIn:da});function ya(t,e,i,n,r){var a,s,o=function(t){var e=t.start,i=t.end;return{start:e,end:i,width:i.x-e.x,height:Math.abs(i.y-e.y)}}(i),h=o.start,u=o.end,l=o.width,c=o.height,f=new Ji.Rect({attrs:{x:h.x,y:u.y,width:l,height:c}});"y"===r?(a=h.x+l/2,s=n.y<h.y?n.y:h.y):"x"===r?(a=n.x>h.x?n.x:h.x,s=h.y+c/2):"xy"===r&&(i.isPolar?(a=i.center.x,s=i.center.y):(a=(h.x+u.x)/2,s=(h.y+u.y)/2));var g=ga(f,[a,s],r);f.isClip=!0,f.endState={matrix:g},f.set("canvas",t.get("canvas")),t.attr("clip",f);pa(f,f.endState,e,(function(){t.attr("clip",null),f.remove(!0)}))}function ma(t,e,i){for(var n=t.get("children"),r=0,a=n.length;r<a;r++){var s=n[r],o=s.getBBox();pa(s,{matrix:ga(s,[(o.minX+o.maxX)/2,(o.minY+o.maxY)/2],i)},e)}}function xa(t,e,i,n){ya(t,e,i,n,"x")}function _a(t,e,i,n){ya(t,e,i,n,"y")}function Sa(t,e,i,n){ya(t,e,i,n,"xy")}function Ma(t,e){ma(t,e,"xy")}function wa(t,e,i){var n=Yn(i);n.set("canvas",t.get("canvas")),t.attr("clip",n);var r={};if(i.isPolar){var a=i.startAngle,s=i.endAngle;r.endAngle=s,n.attr("endAngle",a)}else{var o=i.start,h=i.end,u=Math.abs(o.x-h.x),l=Math.abs(o.y-h.y);i.isTransposed?(n.attr("height",0),r.height=l):(n.attr("width",0),r.width=u)}pa(n,r,e,(function(){t.attr("clip",null),n.remove(!0)}))}var ba,Ca=Object.freeze({__proto__:null,groupWaveIn:wa,groupScaleInX:xa,groupScaleInY:_a,groupScaleInXY:Sa,shapesScaleInX:function(t,e){ma(t,e,"x")},shapesScaleInY:function(t,e){ma(t,e,"y")},shapesScaleInXY:Ma});Ui.prototype.animate=function(){var t=T({},this.get("attrs"));return new la(this,t,ba)},Fn.prototype.animate=function(t){return this.set("animate",t),this},fa.Action=va,fa.defaultCfg={interval:{enter:function(t){return t.isPolar&&t.transposed?function(t){t.set("zIndex",-1),t.get("parent").sort()}:da}},area:{enter:function(t){return t.isPolar?null:da}},line:{enter:function(t){return t.isPolar?null:da}},path:{enter:function(t){return t.isPolar?null:da}}};var Pa={line:function(t){return t.isPolar?Sa:wa},area:function(t){return t.isPolar?Sa:wa},path:function(t){return t.isPolar?Sa:wa},point:function(){return Ma},interval:function(t){var e;return t.isPolar?(e=Sa,t.transposed&&(e=wa)):e=t.transposed?xa:_a,e},schema:function(){return wa}};function ka(t,e,i){var n=[];return u(t,(function(t,r){var a=t.get("container").get("children"),o=t.get("type"),h=s(t.get("animateCfg"))?Ia(o,e):t.get("animateCfg");!1!==h&&u(a,(function(e,a){e.get("className")===o&&(e._id=function(t,e,i){var n,r=t.get("type"),a="geom"+i+"-"+r,s=t.getXScale(),o=t.getYScale(),h=s.field||"x",l=o.field||"y",c=e[l];return n=s.isIdentity?s.value:e[h],a+="interval"===r||"schema"===r?"-"+n:"line"===r||"area"===r||"path"===r?"-"+r:s.isCategory?"-"+n:"-"+n+"-"+c,u(t._getGroupScales(),(function(t){var i=t.field;"identity"!==t.type&&(a+="-"+e[i])})),a}(t,e.get("origin")._origin,r),e.set("coord",i),e.set("animateCfg",h),e.set("index",a),n.push(e))})),t.set("shapes",a)})),n}function Ta(t,e,i,n){return a(n)?n:g(n)?fa.Action[n]:fa.getAnimation(t,e,i)}function Da(t,e,i){if(!1===i||h(i)&&!1===i[e])return!1;var n=fa.getAnimateCfg(t,e);return i&&i[e]?A({},n,i[e]):n}function Aa(t,e,i){var n,r,s=[],h=[];u(e,(function(e){var i=t[e._id];i?(e.set("cacheShape",i),s.push(e),delete t[e._id]):h.push(e)})),u(t,(function(t){var e=t.className,s=t.coord,o=t._id,h=t.attrs,u=t.index,l=t.type;if(!1===(r=Da(e,"leave",t.animateCfg)))return!0;if(n=Ta(e,s,"leave",r.animation),a(n)){var c=i.addShape(l,{attrs:h,index:u,canvas:i,className:e});c._id=o,n(c,r,s)}})),u(s,(function(t){var e=t.get("className");if(!1===(r=Da(e,"update",t.get("animateCfg"))))return!0;var i=t.get("coord"),s=t.get("cacheShape").attrs,h=function(t,e){var i={};for(var n in e)(m(t[n])&&t[n]!==e[n]||o(t[n])&&JSON.stringify(t[n])!==JSON.stringify(e[n]))&&(i[n]=e[n]);return i}(s,t._attrs.attrs);if(Object.keys(h).length)if(n=Ta(e,i,"update",r.animation),a(n))n(t,r,i);else{var l={};u(h,(function(t,e){l[e]=s[e]})),t.attr(l),t.animate().to({attrs:h,duration:r.duration,easing:r.easing,delay:r.delay}).onEnd((function(){t.set("cacheShape",null)}))}})),u(h,(function(t){var e=t.get("className"),i=t.get("coord");if(!1===(r=Da(e,"enter",t.get("animateCfg"))))return!0;if(n=Ta(e,i,"enter",r.animation),a(n))if("interval"===e&&i.isPolar&&i.transposed){var o=t.get("index"),h=s[o-1];n(t,r,h)}else n(t,r,i)}))}function Ia(t,e){if(!t)return null;var i=e.get("animate");return t.indexOf("guide-tag")>-1&&(t="guide-tag"),h(i)?i[t]:!1!==i&&null}function Ya(){(ba=new ia).play()}function Oa(t){if(!1!==t.get("animate")){var e=t.get("isUpdate"),i=t.get("canvas"),n=t.get("coord"),r=t.get("geoms"),o=i.get("caches")||[];0===o.length&&(e=!1);var h=ka(r,t,n),l=t.get("axisController"),c=l.frontPlot,f=l.backPlot,g=c.get("children").concat(f.get("children")),p=[];t.get("guideController")&&(p=t.get("guideController").guideShapes);var d,v,y=[];if(g.concat(p).forEach((function(e){var i=Ia(e.get("className"),t);e.set("coord",n),e.set("animateCfg",i),y.push(e),h.push(e)})),i.set("caches",function(t){for(var e={},i=0,n=t.length;i<n;i++){var r=t[i];if(r._id&&!r.isClip){var a=r._id;e[a]={_id:a,type:r.get("type"),attrs:T({},r._attrs.attrs),className:r.get("className"),geomType:r.get("className"),index:r.get("index"),coord:r.get("coord"),animateCfg:r.get("animateCfg")}}}return e}(h)),e)Aa(o,h,i);else u(r,(function(e){var i=e.get("type"),r=s(e.get("animateCfg"))?Ia(i,t):e.get("animateCfg");if(!1!==r)if(d=Da(i,"appear",r),v=Ta(i,n,"appear",d.animation),a(v))u(e.get("shapes"),(function(t){v(t,d,n)}));else if(Pa[i]){v=Ca[d.animation]||Pa[i](n);var o=e.getYScale(),h=n.convertPoint({x:0,y:o.scale(e.getYMinValue())}),l=e.get("container");v&&v(l,d,n,h)}})),u(y,(function(t){var e=t.get("animateCfg"),i=t.get("className");if(e&&e.appear){var r=fa.getAnimateCfg(i,"appear"),s=A({},r,e.appear),o=Ta(i,n,"appear",s.animation);a(o)&&o(t,s,n)}}))}}function Ea(){ba.stop()}var Na={afterCanvasInit:Ya,beforeCanvasDraw:Oa,afterCanvasDestroyed:Ea},Fa=Object.freeze({__proto__:null,afterCanvasInit:Ya,beforeCanvasDraw:Oa,afterCanvasDestroyed:Ea,default:Na});Fn._Interactions={},Fn.registerInteraction=function(t,e){Fn._Interactions[t]=e},Fn.getInteraction=function(t){return Fn._Interactions[t]},Fn.prototype.interaction=function(t,e){var i=this._interactions||{};i[t]&&i[t].destroy();var n=new(Fn.getInteraction(t))(e,this);return i[t]=n,this._interactions=i,this},Fn.prototype.clearInteraction=function(t){var e=this._interactions;if(e)return t?(e[t]&&e[t].destroy(),delete e[t]):u(e,(function(t,i){t.destroy(),delete e[i]})),this};var za=[0,1],Ba=function(){function t(t){var e=this;yt(this,"chart",null),yt(this,"values",null),yt(this,"range",za),yt(this,"startRange",za),yt(this,"minCount",10),yt(this,"_afterinit",(function(){var t=e.getPinchScale(),i=[].concat(t.values);e.values=i,e.minScale||(e.minScale=e.minCount/i.length),e.range!==za&&(e.updateRange(e.range),e.updateTicks())})),yt(this,"_afterdatachange",(function(){e.updateRange(e.range)})),this.chart=t,this._initEvent(t)}var e=t.prototype;return e._initEvent=function(t){t.on("afterinit",this._afterinit),t.on("afterdatachange",this._afterdatachange)},e.getPinchScale=function(){return this.chart.getXScale()},e.getFollowScale=function(){return(this.chart.getYScales()||[])[0]},e.start=function(){var t=this.range,e=this.getPinchScale(),i=t[0],n=t[1];this.startRange=[i,n],this.lastTickCount=e.tickCount},e.doZoom=function(t,e,i){var n=this.startRange,r=this.minScale,a=n[0],s=n[1],o=(s-a)*(1-i),h=o*t,u=o*e,l=Math.max(0,a-h),c=Math.min(1,s+u),f=[l,c];c-l<r||this.updateRange(f)},e.doMove=function(t){if(t){var e,i=this.startRange,n=i[0],r=i[1],a=r-n,s=a*t,o=n-s,h=r-s;e=o<0?[0,a]:h>1?[1-a,1]:[o,h],this.updateRange(e)}},e.updateRange=function(t){var e=this.values,i=t[0],n=t[1];i=Math.max(0,i),n=Math.min(1,n),this.range=[i,n];var r=e.length,a=i*r,s=n*r,o=e.slice(a,s);this.repaint(o)},e.repaint=function(t){var e=this.chart,i=this.getPinchScale(),n=i.values,r=i.ticks;(function(t,e){if(t.length!==e.length)return!1;var i=t.length-1;return t[0]===e[0]&&t[i]===e[i]})(n,t)||(this.updateScale(i,{ticks:r,values:t}),this.updateFollowScale(i,t),e.repaint())},e.updateFollowScale=function(t,e){var i=this.chart,n=this.getFollowScale(),r=t.field,a=t.type,s=n.field,o=[],h={};e.forEach((function(t){h[t]=!0})),i.get("data").forEach((function(t){if("timeCat"===a){var e=ct(t[r]);h[e]&&o.push(t[s])}}));var u=R(o),l=u.min,c=u.max;this.updateScale(n,{min:l,max:c,nice:!0})},e.updateScale=function(t,e){t&&t.change(e)},e.updateTicks=function(){var t=this.chart,e=this.values,i=this.getPinchScale(),n=i.values,r=i.tickCount,a=Math.round(r*e.length/n.length),s=Kt("cat")({tickCount:a,values:e});this.updateScale(i,{ticks:s,values:n}),t.repaint()},e.destroy=function(){var t=this.chart;t.off("afterinit",this._afterinit),t.off("afterdatachange",this._afterdatachange)},t}(),Xa=function(){var t=e.prototype;function e(t,e){var i=this;yt(this,"type",""),yt(this,"startEvent","touchstart"),yt(this,"processEvent","touchmove"),yt(this,"endEvent","touchend"),yt(this,"resetEvent",null),yt(this,"context",null),yt(this,"_start",(function(t){i.preStart&&i.preStart(t),i.start(t),i.onStart&&i.onStart(t)})),yt(this,"_process",(function(t){i.preProcess&&i.preProcess(t),i.process(t),i.onProcess&&i.onProcess(t)})),yt(this,"_end",(function(t){i.preEnd&&i.preEnd(t),i.end(t),i.onEnd&&i.onEnd(t)})),yt(this,"_reset",(function(t){i.preReset&&i.preReset(t),i.reset(t),i.onReset&&i.onReset(t)})),T(this,this.getDefaultCfg(),t),this.context=this.getInteractionContext(e),this.chart=e;var n=this.range;n&&(this.context.range=n),this._bindEvents(e)}return t.getDefaultCfg=function(){return{}},t.getInteractionContext=function(t){var e=t.get("interactionContext");return e||(e=new Ba(t),t.set("interactionContext",e),e)},t._bindEvents=function(t){var e=this.startEvent,i=this.processEvent,n=this.endEvent,r=this.resetEvent,a=t.get("canvas");a.on(e,this._start),a.on(i,this._process),a.on(n,this._end),a.on(r,this._reset)},t._clearEvents=function(){var t=this.chart,e=this.startEvent,i=this.processEvent,n=this.endEvent,r=this.resetEvent,a=t.get("canvas");a.off(e,this._start),a.off(i,this._process),a.off(n,this._end),a.off(r,this._start)},t.start=function(){},t.process=function(){},t.end=function(){},t.reset=function(){},t.destroy=function(){this.context.destroy(),this._clearEvents()},e}(),La=function(t){function e(){return t.apply(this,arguments)||this}xt(e,t);var i=e.prototype;return i.getDefaultCfg=function(){return{type:"pan",startEvent:"panstart",processEvent:"pan",endEvent:"panend"}},i.start=function(){this.context.start()},i.process=function(t){var e=t.direction,i=t.deltaX;if("up"!==e&&"down"!==e){t.preventDefault&&t.preventDefault();var n=this.context,r=n.chart.get("coord"),a=r.start,s=i/(r.end.x-a.x);n.doMove(s)}},e}(Xa),ja=function(t){xt(i,t);var e=i.prototype;function i(e,i){var n;return T(_t(n=t.call(this,e,i)||this).context,e),n}return e.getDefaultCfg=function(){return{type:"pinch",startEvent:"pinchstart",processEvent:"pinch",endEvent:"pinchend"}},e.start=function(){this.context.start()},e.process=function(t){t.preventDefault&&t.preventDefault();var e=t.zoom,i=t.center,n=this.context,r=n.chart.get("coord"),a=r.start,s=r.end,o=s.x-a.x,h=Math.abs(i.x-a.x)/o,u=Math.abs(s.x-i.x)/o;n.doZoom(h,u,e)},e.end=function(){this.context.updateTicks()},i}(Xa);Fn.registerInteraction("pan",La),Fn.registerInteraction("pinch",ja);var Ga={Marker:Ji.Marker,Tooltip:Tr};Fn.plugins.register([Xr,ta,Vr,Fa]);var Ra={Component:Ga,Global:vt,Chart:Fn,Shape:jt,G:In,Util:ft,Helper:En,track:zn,Animate:fa};t.Animate=fa,t.Chart=Fn,t.Component=Ga,t.G=In,t.Global=vt,t.Helper=En,t.Shape=jt,t.Util=ft,t.default=Ra,t.track=zn,Object.defineProperty(t,"__esModule",{value:!0})}));
diff --git a/uni_modules/lime-f2/components/lime-f2/index.vue b/uni_modules/lime-f2/components/lime-f2/index.vue
new file mode 100644
index 0000000..8e3ef78
--- /dev/null
+++ b/uni_modules/lime-f2/components/lime-f2/index.vue
@@ -0,0 +1,437 @@
+<template>
+	<view class="l-f2" :style="customStyle" v-if="canvasId">
+		<!-- #ifndef APP-NVUE -->
+		<cover-view class="l-f2__mask" v-if="isMask"></cover-view>
+		<canvas
+			class="l-f2__canvas"
+			v-if="use2dCanvas"
+			type="2d"
+			:id="canvasId"
+			:style="'width:' + width + 'px;height:' + height + 'px'"
+			:disable-scroll="isDisableScroll"
+			@touchstart="touchStart"
+			@touchmove="touchMove"
+			@touchend="touchEnd"
+		/>
+		<canvas
+			class="l-f2__canvas"
+			v-else
+			:width="nodeWidth"
+			:height="nodeHeight"
+			:style="'width:' + width + 'px;height:' + height + 'px'"
+			:canvas-id="canvasId"
+			:id="canvasId"
+			:disable-scroll="isDisableScroll"
+			@touchstart="touchStart"
+			@touchmove="touchMove"
+			@touchend="touchEnd"
+		/>
+		<view v-if="isCloud" style="width:2048px; height:2048px; position: fixed; left: 9999px;">
+			<canvas v-if="use2dCanvas" type="2d" :canvas-id="canvasId + '_cloud'" :id="canvasId + '_cloud'" class="l-f2__canvas"></canvas>
+			<canvas v-else :canvas-id="canvasId + '_cloud'" :id="canvasId + '_cloud'" class="l-f2__canvas"></canvas>
+		</view>
+		<!-- #endif -->
+		<!-- #ifdef APP-NVUE -->
+		<web-view
+			class="l-f2__canvas"
+			:id="canvasId"
+			ref="webview"
+			:webviewStyles="webviewStyles"
+			src="http://liangei.gitee.io/limeui/hybrid/html/lime-ui/lime-f2/index.html?v=0.4.8"
+			@pagefinish="isFinish = true"
+			@onPostMessage="onMessage"
+		></web-view>
+		<!-- #endif -->
+	</view>
+</template>
+<script>
+// #ifndef APP-NVUE
+import extendContext from './canvas';
+import { compareVersion, wrapEvent, pixelRatio } from './utils';
+// #endif
+// #ifdef APP-NVUE
+import { base64ToPath } from './utils';
+// #endif
+export default {
+	// version: '0.5.1'
+	name: 'l-f2',
+	props: {
+		// #ifdef MP-WEIXIN || MP-TOUTIAO
+		type: {
+			type: String,
+			default: '2d'
+		},
+		// #endif
+		// #ifdef APP-NVUE
+		webviewStyles: Object,
+		params: {
+			type: Object,
+			default: () => {}
+		},
+		// #endif
+		customStyle: String,
+		imageMask: String,
+		source: {
+			type: Array,
+			default: () => []
+		},
+		isAutoPlay: Boolean,
+		isDisableScroll: Boolean,
+		isCloud: Boolean,
+		onInit: {
+			type: [Function, Object],
+			default: () => {}
+		}
+	},
+	data() {
+		return {
+			// #ifdef MP-WEIXIN || MP-TOUTIAO
+			use2dCanvas: true,
+			// #endif
+			// #ifndef MP-WEIXIN || MP-TOUTIAO
+			use2dCanvas: false,
+			// #endif
+			// #ifndef APP-NVUE
+			width: null,
+			height: null,
+			nodeWidth: null,
+			nodeHeight: null,
+			isMask: false,
+			isInited: false,
+			imageData: null,
+			config: {},
+			// #endif
+			// #ifdef APP-NVUE
+			isFinish: false,
+			file: ''
+			// #endif
+		};
+	},
+	computed: {
+		canvasId() {
+			return `l-f2${this._uid}`;
+		}
+	},
+	watch: {
+		isAutoPlay(val) {
+			if (val) {
+				this.changeData(this.source);
+			}
+		},
+		source: {
+			handler: function(data) {
+				if (this.isAutoPlay) {
+					this.changeData(data);
+				}
+			},
+			deep: true
+		}
+	},
+	beforeDestroy() {
+		this.clear();
+		this.destroy();
+	},
+	created() {
+		this.isMask = this.isCloud && this.imageMask;
+		// #ifdef MP-WEIXIN || MP-TOUTIAO
+		const { SDKVersion, version, platform, environment } = uni.getSystemInfoSync();
+		// #endif
+		// #ifdef MP-WEIXIN
+		this.use2dCanvas = this.type === '2d' && compareVersion(SDKVersion, '2.9.2') >= 0 && !((/ios/i.test(platform) && /7.0.20/.test(version)) || /wxwork/i.test(environment));
+		// #endif
+		// #ifdef MP-TOUTIAO
+		this.use2dCanvas = this.type === '2d' && compareVersion(SDKVersion, '1.78.0') >= 0;
+		// #endif
+	},
+
+	async mounted() {
+		if (this.onInit) {
+			this.init(this.onInit);
+		}
+	},
+	methods: {
+		// #ifdef APP-NVUE
+		onMessage(e) {
+			const res = e?.detail?.data[0] || null;
+			if (res?.event) {
+				this.$emit(res.event, JSON.parse(res.data));
+			} else if (res?.file) {
+				this.file = res.data;
+			} else {
+				console.error(res);
+			}
+		},
+		// #endif
+		async init(func, params = null) {
+			// #ifdef APP-NVUE
+			this.$watch(
+				'isFinish',
+				(n, o) => {
+					(n || o) && (params || this.params) && this.$refs.webview.evalJs(`init(${JSON.stringify(func.toString())}, ${JSON.stringify(params || this.params)})`);
+					this.isInited = true;
+				},
+				{
+					immediate: true
+				}
+			);
+			// #endif
+			// #ifndef APP-NVUE
+			let config = await this.getContext(this.canvasId);
+			if (this.isCloud) {
+				let imageMask = null;
+				if (this.imageMask) {
+					this.isMask = true;
+					imageMask = await this.getImageMask(config);
+					this.imageData = imageMask;
+					this.isMask = false;
+				}
+				let cloud = await this.getContext(this.canvasId + '_cloud');
+				config = Object.assign({}, config, { cloud, imageMask });
+			}
+			const chart = await func(config);
+			if (chart) {
+				// #ifdef H5 || APP-PLUS
+				chart.repaint();
+				// #endif
+				this.chart = chart;
+				this.canvasEl = chart.get('el');
+				this.isInited = true;
+			}
+			// #endif
+		},
+		changeData(data) {
+			// #ifndef APP-NVUE
+			if (this.chart) {
+				this.chart.changeData(data || this.source);
+			}
+			// #endif
+			// #ifdef APP-NVUE
+			this.$refs.webview.evalJs(`changeData(${JSON.stringify(data || this.source)})`);
+			// #endif
+		},
+		clear() {
+			// #ifndef APP-NVUE
+			if (this.chart) {
+				this.chart.clear();
+			}
+			// #endif
+			// #ifdef APP-NVUE
+			this.$refs.webview.evalJs(`clear()`);
+			// #endif
+		},
+		destroy() {
+			// #ifndef APP-NVUE
+			if (this.chart) {
+				this.chart.destroy();
+			}
+			// #endif
+			// #ifdef APP-NVUE
+			this.$refs.webview.evalJs(`destroy()`);
+			// #endif
+		},
+		repaint() {
+			this.changeData(this.source);
+		},
+		reset(func, params = null) {
+			// #ifndef APP-NVUE
+			this.$watch(
+				'isInited',
+				v => v && func(this.chart),
+				{
+					immediate: true
+				}
+			);
+
+			// #endif
+			// #ifdef APP-NVUE
+			this.$refs.webview.evalJs(`reset(${JSON.stringify(func.toString())}, ${JSON.stringify(params || this.params)})`);
+			// #endif
+		},
+		canvasToTempFilePath(args = {}) {
+			// #ifndef APP-NVUE
+			const { use2dCanvas, canvasId, config } = this;
+			return new Promise((resolve, reject) => {
+				const copyArgs = Object.assign(
+					{
+						canvasId,
+						success: resolve,
+						fail: reject
+					},
+					args
+				);
+				if (use2dCanvas) {
+					let { canvas } = config[canvasId];
+					delete copyArgs.canvasId;
+					copyArgs.canvas = canvas;
+				}
+				uni.canvasToTempFilePath(copyArgs, this);
+			});
+			// #endif
+			// #ifdef APP-NVUE
+			this.file = '';
+			this.$refs.webview.evalJs(`canvasToTempFilePath()`);
+			return new Promise((resolve, reject) => {
+				this.$watch('file', async file => {
+					if (file) {
+						const tempFilePath = await base64ToPath(file);
+						resolve(args.success({ tempFilePath }));
+					} else {
+						reject(args.fail({ error: `` }));
+					}
+				});
+			});
+			// #endif
+		},
+		// #ifndef APP-NVUE
+		getImageMask(config) {
+			return new Promise(resolve => {
+				uni.getImageInfo({
+					src: this.imageMask,
+					success: async res => {
+						if (res.path) {
+							// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO
+							const localReg = /^\.|^\/(?=[^\/])/;
+							res.path = localReg.test(this.imageMask) ? `/${res.path}` : res.path;
+							// #endif
+							const { context, width, height, canvas } = config;
+							if (this.use2dCanvas) {
+								const imageMask = () => {
+									const imageMask = canvas.createImage();
+									imageMask.crossOrigin = '';
+									imageMask.src = res.path;
+									imageMask.onload = async () => {
+										context.drawImage(imageMask, 0, 0, res.width, res.height, 0, 0, width, height);
+										const imageData = context.getImageData(0, 0, width, height).data;
+										context.clearRect(0, 0, width, height);
+										resolve(imageData);
+									};
+								};
+								imageMask();
+							} else {
+								// #ifndef MP-BAIDU
+								context.drawImage(res.path, 0, 0, res.width, res.height, 0, 0, width, height);
+								// #endif
+								// #ifdef MP-BAIDU
+								context.drawImage(res.path, 0, 0, width, height, 0, 0, res.width, res.height);
+								// #endif
+								await this.canvasDraw(context);
+								const imageData = await context.getImageData(0, 0, width, height);
+								context.clearRect(0, 0, width, height);
+								await this.canvasDraw(context);
+								resolve(imageData);
+							}
+						}
+					},
+					fail(err) {
+						console.error(JSON.stringify(err));
+						resolve(null);
+					}
+				});
+			});
+		},
+		canvasDraw(ctx) {
+			return new Promise(resolve => {
+				ctx.draw(false, () => {
+					setTimeout(() => {
+						resolve(true);
+					}, 100);
+				});
+			});
+		},
+		getContext(canvasId) {
+			const { use2dCanvas, type = '2d', config } = this;
+			if (config[canvasId]?.context) {
+				return Promise.resolve(config[canvasId]);
+			}
+			if (use2dCanvas) {
+				return new Promise(resolve => {
+					uni.createSelectorQuery()
+						.in(this)
+						.select(`#${canvasId}`)
+						.fields({
+							node: true,
+							size: true
+						})
+						.exec(res => {
+							let { node, width, height } = res[0];
+							width = width || 300;
+							height = height || 300;
+							const context = node.getContext(type);
+							if (!canvasId.includes('_cloud')) {
+								this.width = width;
+								this.height = height;
+							}
+							node.width = width * pixelRatio;
+							node.height = height * pixelRatio;
+							this.config[canvasId] = { context: extendContext(context), width, height, pixelRatio, canvas: node };
+							resolve(this.config[canvasId]);
+						});
+				});
+			}
+			return new Promise(resolve => {
+				uni.createSelectorQuery()
+					.in(this)
+					.select(`#${canvasId}`)
+					.boundingClientRect()
+					.exec(res => {
+						if (res) {
+							let { width, height } = res[0];
+							width = width || 300;
+							height = height || 300;
+							const context = uni.createCanvasContext(canvasId, this);
+							if (!canvasId.includes('_cloud')) {
+								this.width = width;
+								this.height = height;
+								// #ifdef MP-ALIPAY
+								this.nodeWidth = width * pixelRatio;
+								this.nodeHeight = height * pixelRatio;
+								// #endif
+							}
+							this.config[canvasId] = { context: extendContext(context), width, height, pixelRatio };
+							resolve(this.config[canvasId]);
+						}
+					});
+			});
+		},
+		touchStart(e) {
+			if (this.canvasEl) {
+				this.canvasEl.dispatchEvent('touchstart', wrapEvent(e));
+			}
+		},
+		touchMove(e) {
+			if (this.canvasEl) {
+				this.canvasEl.dispatchEvent('touchmove', wrapEvent(e));
+			}
+		},
+		touchEnd(e) {
+			if (this.canvasEl) {
+				this.canvasEl.dispatchEvent('touchend', wrapEvent(e));
+			}
+		}
+		// #endif
+	}
+};
+</script>
+<style scoped lang="stylus">
+full()
+	// #ifndef APP-NVUE
+	width 100%
+	height 100%
+	// #endif
+	// #ifdef APP-NVUE
+	flex 1
+	// #endif
+.l-f2
+	full()
+	position relative
+	&__mask
+		position absolute
+		left 0
+		right 0
+		bottom 0
+		top 0
+		background-color #fff
+		z-index 1
+	&__canvas
+		full()
+</style>
diff --git a/uni_modules/lime-f2/components/lime-f2/utils.js b/uni_modules/lime-f2/components/lime-f2/utils.js
new file mode 100644
index 0000000..96cb91f
--- /dev/null
+++ b/uni_modules/lime-f2/components/lime-f2/utils.js
@@ -0,0 +1,65 @@
+// #ifndef APP-NVUE
+// 计算版本
+export function compareVersion(v1, v2) {
+	v1 = v1.split('.')
+	v2 = v2.split('.')
+	const len = Math.max(v1.length, v2.length)
+	while (v1.length < len) {
+		v1.push('0')
+	}
+	while (v2.length < len) {
+		v2.push('0')
+	}
+	for (let i = 0; i < len; i++) {
+		const num1 = parseInt(v1[i], 10)
+		const num2 = parseInt(v2[i], 10)
+
+		if (num1 > num2) {
+			return 1
+		} else if (num1 < num2) {
+			return -1
+		}
+	}
+	return 0
+}
+
+export function wrapEvent(e) {
+	if (!e) return;
+	if (!e.preventDefault) {
+		e.preventDefault = function() {};
+	}
+	return e;
+}
+
+export const pixelRatio = uni.getSystemInfoSync().pixelRatio
+// #endif
+// #ifdef APP-NVUE
+export function base64ToPath(base64) {
+	return new Promise((resolve, reject) => {
+		const [, format, bodyData] = /data:image\/(\w+);base64,(.*)/.exec(base64) || [];
+		const bitmap = new plus.nativeObj.Bitmap('bitmap' + Date.now())
+		bitmap.loadBase64Data(base64, () => {
+			if (!format) {
+				reject(new Error('ERROR_BASE64SRC_PARSE'))
+			}
+			const time = new Date().getTime();
+			const filePath = `_doc/uniapp_temp/${time}.${format}`
+			
+			bitmap.save(filePath, {}, 
+				() => {
+					bitmap.clear()
+					resolve(filePath)
+				}, 
+				(error) => {
+					bitmap.clear()
+					console.error(`${JSON.stringify(error)}`)
+					reject(error)
+				})
+		}, (error) => {
+			bitmap.clear()
+			console.error(`${JSON.stringify(error)}`)
+			reject(error)
+		})
+	})
+}
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-f2/package.json b/uni_modules/lime-f2/package.json
new file mode 100644
index 0000000..2cb3508
--- /dev/null
+++ b/uni_modules/lime-f2/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "lime-f2",
+  "displayName": "蚂蚁图表 antv F2",
+  "version": "0.5.1",
+  "description": "全端兼容,一个专注于移动,开箱即用的可视化解决方案",
+  "keywords": [
+    "蚂蚁金服",
+    "AntV",
+    "F2",
+    "canvas",
+    "图表"
+],
+  "repository": "https://gitee.com/liangei/lime-f2",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "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": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  },
+  "dependencies": {
+  }
+}
diff --git a/uni_modules/lime-f2/readme.md b/uni_modules/lime-f2/readme.md
new file mode 100644
index 0000000..3eed44a
--- /dev/null
+++ b/uni_modules/lime-f2/readme.md
@@ -0,0 +1,358 @@
+# F2 图表
+> F2，一个专注于移动，开箱即用的可视化解决方案 [查看更多](http://liangei.gitee.io/limeui/#/f2)   
+> 基于antv F2 做了兼容处理，更多示例请访问 [uni示例](http://liangei.gitee.io/limeui/#/f2-example) [官方示例](https://f2.antv.vision/zh/examples/gallery)   
+> Q群：1046793420   
+> antv F2 v3.8.7
+
+
+
+## 平台兼容
+
+| H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 头条小程序 | QQ 小程序 | App  |
+| --- | ---------- | ------------ | ---------- | ---------- | --------- | ---- |
+| √   | √          | √         | √      | √       | √      | √ |
+
+
+* ✨ **注意**
+* 🔔 插件用到了 css 预编译器 [stylus](https://ext.dcloud.net.cn/plugin?name=compile-stylus) 请安装
+* 🌈 本插件使用了`webview`支持`nvue`。
+* 📦 本插件没有对F2内部的方法和样式做过改动，只是使其兼容uniapp。
+* 🔔 若F2无法满足于你或有需要特殊能力的请直接去F2 提建议
+* 👉 若F2有兼容问题可向我反馈。
+* 🔔 默认只提供`f2.min.js`,如果需要`f2-all`或`f2-simple`可去码云下载按自已需要引入！
+
+## 安装
+在uniapp 插件市场 找到 [蚂蚁图表](https://ext.dcloud.net.cn/plugin?id=4613) 导入即可
+
+## 代码演示
+
+### 基础用法
+通过`ref`获取节点组件内部`init`方法生成图表
+
+```html
+<view style="width: 100%; height:500rpx"><l-f2 ref="chart"></l-f2></view>
+```
+
+```js
+// 非 nvue 页面需要引进
+import F2 from '@/uni_modules/lime-f2/components/lime-f2/f2.min.js';
+import lF2 from '@/uni_modules/lime-f2/components/lime-f2/'
+export default {
+	components: {lF2},
+	data() {
+		return {
+			baseData: [{ genre: '成犬粮', sold: 275 }, { genre: '化毛膏', sold: 115 }, { genre: '益生菌', sold: 120 }, { genre: '氨糖', sold: 350 }, { genre: '其它', sold: 150 }],
+		};
+	},
+	mounted() {
+		this.$refs.chart.init(config => {
+			const chart = new F2.Chart(config);
+			chart.source(this.baseData);
+			chart
+				.interval()
+				.position('genre*sold')
+				.color('genre');
+			chart.render();
+			// 需要把 chart 返回
+			return chart;
+		});
+	}
+}
+```
+
+### 图饼
+图饼示例，更多用法和示例请访问[F2 示例](http://liangei.gitee.io/limeui/#/f2-example) 
+
+```html
+<view style="width: 100%; height:500rpx"><l-f2 ref="chart"></l-f2></view>
+```
+
+```js
+data() {
+	return {
+		pieMap: {
+			'芳华': '40%',
+			'妖猫传': '20%',
+			'机器之血': '18%',
+			'心理罪': '15%',
+			'寻梦环游记': '5%',
+			'其他': '2%'
+		  },
+		pieData: [
+			{
+				name: '芳华',
+				percent: 0.4,
+				a: '1'
+			},
+			{
+				name: '妖猫传',
+				percent: 0.2,
+				a: '1'
+			},
+			{
+				name: '机器之血',
+				percent: 0.18,
+				a: '1'
+			},
+			{
+				name: '心理罪',
+				percent: 0.15,
+				a: '1'
+			},
+			{
+				name: '寻梦环游记',
+				percent: 0.05,
+				a: '1'
+			},
+			{
+				name: '其他',
+				percent: 0.02,
+				a: '1'
+			}
+		]
+	};
+},
+mounted() {
+	this.$refs.chart.init(config => {
+		const chart = new F2.Chart(config);
+		chart.source(this.pieData, {
+			percent: {
+				formatter:  val => val * 100 + '%';
+			}
+		});
+		chart.legend({
+			position: 'right',
+			itemFormatter: val =>  val + '  ' + this.pieMap[val]; 
+		});
+		chart.tooltip(false);
+		chart.coord('polar', {
+			transposed: true,
+			radius: 0.85
+		});
+		chart.axis(false);
+		chart
+			.interval()
+			.position('a*percent')
+			.color('name', ['#1890FF', '#13C2C2', '#2FC25B', '#FACC14', '#F04864', '#8543E0'])
+			.adjust('stack')
+			.style({
+				lineWidth: 1,
+				stroke: '#fff',
+				lineJoin: 'round',
+				lineCap: 'round'
+			})
+			.animate({
+				appear: {
+					duration: 1200,
+					easing: 'bounceOut'
+				}
+			});
+		chart.render();
+		// 需要把 chart 返回
+		return chart;
+	});
+}
+```
+
+### 数据更新
+> F2 更新数据的方式有三种：
+
+
+1、通过 `ref` 获取组件实例，使用内部方法`changeData(data)`更新数据
+- 前后数据结构不发生变化，需要马上更新图表。
+```js
+this.$refs.chart.changeData(data)
+```
+
+2、在节点上设置 `source` 源数据和 `isAutoPlay` 自动更新。
+- 前后数据结构不发生变化，需要马上更新图表。
+```html
+<view style="width: 100%; height:500rpx"><l-f2 ref="chart" :source="data" is-auto-play></l-f2></view>
+```
+
+```js
+data() {
+	return {
+		data: [{ genre: '成犬粮', sold: 275 }, { genre: '化毛膏', sold: 115 }, { genre: '益生菌', sold: 120 }, { genre: '氨糖', sold: 350 }, { genre: '其它', sold: 150 }],
+	}
+}
+```
+
+3、如果仅仅是更新数据，而不需要马上更新图表，在节点上设置 `source` 源数据，然后在需要更新图表时调用内部方法 `repaint()` 或在节点上设置 `isAutoPlay` 为 `true`
+- 前后数据结构不发生变化，不需要立即更新数据
+```html
+<view style="width: 100%; height:500rpx"><l-f2 ref="chart" :source="data" :isAutoPlay="isAutoPlay"></l-f2></view>
+```
+
+```js
+// 1 调用内部方法
+this.$refs.chart.repaint(); 
+// 2 先设置isAutoPlay为false,再需要时设置为true
+this.isAutoPlay = true
+```
+
+4、更新数据时还可以清除图表上的所有元素，重新定义图形语法，改变图表类型和各种配置。
+- 前后数据结构发生变化 或 需要更改text等元素。
+
+```js
+this.$refs.chart.reset(chart => {
+		const baseData = [{ genre: '成犬粮', sold: 375 }, { genre: '化毛膏', sold: 15 }, { genre: '益生菌', sold: 20 }, { genre: '氨糖', sold: 240 }, { genre: '其它', sold: 150 }];
+		chart.clear() // 清理所有
+		chart.source(baseData); // 加载新数据
+		chart.interval().position('genre*sold').color('sold'); // 重新定义图形语法
+		chart.render();
+		return chart;
+	})
+}); 
+
+```
+
+
+
+### Nvue
+本插件通过`webview`组件使得 `antv F2` 能在`nvue`里使用。
+
+* ✨ **温馨提示**
+* 👉 webview使用了网络路径，可自行下载放置根目录下的`hybrid`文件夹里再修改路径即可。
+* 🛡  **不需要引进F2 JS文件**
+* ⚙️ 在函数外面的数据需要通过`init`方法的第二个参数传递数据
+
+```html
+<view class="f2"><l-f2 ref="chart"></l-f2></view>
+```
+```js
+export default {
+	data() {
+		return {
+			baseData: [{ genre: '成犬粮', sold: 275 }, { genre: '化毛膏', sold: 115 }, { genre: '益生菌', sold: 120 }, { genre: '氨糖', sold: 350 }, { genre: '其它', sold: 150 }],
+		}
+	},
+	mounted() {
+		this.$refs.chart.init(config => {
+			const chart = new F2.Chart(config);
+			// 在函数外面的数据，需要在第二个参数传进去。
+			// 数据名保持跟this里的一致
+			chart.source(baseData);
+			chart
+				.interval()
+				.position('genre*sold')
+				.color('genre');
+			chart.render();
+			return chart;
+		},
+		// 在函数外面的数据需要传进组件
+		{baseData: this.baseData}
+		);
+	}
+}
+
+```
+## Nvue 使用注意事项
+- 由于 nvue 使用的是字符串模板传输，打包的时候会被混淆压缩
+- 所在要保持 **关键词** 不被 **混淆压缩**
+
+#### 1、F2、DataSet 不需要被引入
+
+👎 错误
+
+```js
+import F2 from '@/uni_modules/lime-f2/components/lime-f2/f2-all.min.js';
+import DataSet from '@/antv/DataSet'
+export default {
+	...code
+}
+```
+
+👍 正确
+
+```js
+export default {
+	...code
+}
+```
+
+#### 2、引用函数外面数据的**关键词**不需要声明
+
+👎 错误
+
+```js
+const {data} = this
+this.$refs.chart.init(config => {
+	chart.source(data);
+})
+
+```
+
+👍 正确
+
+```js
+// 所有用函数外里的数据，只要保持跟 this 里的一致
+this.$refs.chart.init(config => {
+	chart.source(data);
+})
+
+- or -
+
+this.$refs.chart.init(config => {
+	chart.source(this.data);
+})
+```
+
+#### 3、引用函数外面的数据需要通过**params**或函数的第二个参数传递 
+
+👎 错误
+
+```html
+<l-f2 />
+
+- or -
+
+this.$refs.chart.init(config => {...code})
+```
+
+👍 正确
+
+```html
+<l-f2 :params="{data}"/>
+
+- or -
+
+this.$refs.chart.init(config => {...code}, {data: this.data})
+```
+
+## 不支持的功能
+- 目前由于小程序不支持 `document`，所以 `Guide.Html` 辅助元素组件目前仍无法使用，其他 F2 的功能全部支持。
+- **Nvue**是通过`webview`实现的,所以它不受影响！
+- **H5** uni官方 `canvas` 模拟了 小程序 所以也不支持 。 
+- 缩放手势暂时不支持，因为原厂也不支持小程序，将来如果有需要考虑修改源码。
+- 词云原厂也是不支持小程序，本插件修改源码使得支持，但头条小程序需要1.78.0以后。
+
+
+## Props
+
+| 参数             | 说明                                                            | 类型           | 默认值        | 版本 	|
+| ---------------  | --------                                                        | -------        | ------------ | ----- 	|
+| custom-style     | 自定义样式                                                      |   `string`     | -            | -     	|
+| params           | 仅针对nvue的数据传递,同init函数的第二个参数，两选一               |    `object`    | -            | -     	|
+| webviewStyles    | 仅针对nvue的webview设置样式                                      |    `object`    | -            | -     	|
+| source           | 图表数据                                                        |    `array`     | -            | 0.3.0  	|
+| type             | canvas 类型 2d 仅针对微信和头条有效                              |    `string`    | `2d`         | 0.3.0  	|
+| isAutoPlay       | 设置了上方的 图表数据 再 设置本参数 ，只要数据发生改动就更新图表   |    `boolean`    | `false`     | 0.3.0    |
+| is-disable-scroll | 触摸图表时是否禁止页面滚动                                      |    `boolean`     | `false`     |   	    |
+
+## 事件
+
+| 参数                   | 说明                                                                                                             |
+| ---------------        | ---------------                                                                                                  |
+| init(callback, data)   | **callback**: 回调函数    **data**: `nvue` 如果使用了外部数据，需要传递                                          |  
+| changeData(data)       | 更新数据 ，传递是数据数组                                                                                         |  
+| clear()                | 清除所有                                                                                                         |  
+| destroy()              | 销毁实例                                                                                                         |  
+| repaint()              | 用于暂时只更新数据，等需要时再调用重绘                                                                             |  
+| reset(callback, data)  | 重新定义图形语法，改变图表类型和各种配置, **callback**: 回调函数    **data**: `nvue` 如果使用了外部数据，需要传递  |  
+| canvasToTempFilePath(opt)  | 用于生成图片  |  
+
+## 打赏
+如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。  
+
+![输入图片说明](https://cdn.jsdelivr.net/gh/liangei/image@latest/222521_bb543f96_518581.jpeg "微信图片编辑_20201122220352.jpg")
\ 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..4cde217
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,8 @@
+## 1.2.1（2021-09-17）
+- 新增 支持使用 css 图标库扩展组件（仅 vue 支持）
+## 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..60b7332
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -0,0 +1,132 @@
+export default {
+	"pulldown": "\ue588",
+	"refreshempty": "\ue461",
+	"back": "\ue471",
+	"forward": "\ue470",
+	"more": "\ue507",
+	"more-filled": "\ue537",
+	"scan": "\ue612",
+	"qq": "\ue264",
+	"weibo": "\ue260",
+	"weixin": "\ue261",
+	"pengyouquan": "\ue262",
+	"loop": "\ue565",
+	"refresh": "\ue407",
+	"refresh-filled": "\ue437",
+	"arrowthindown": "\ue585",
+	"arrowthinleft": "\ue586",
+	"arrowthinright": "\ue587",
+	"arrowthinup": "\ue584",
+	"undo-filled": "\ue7d6",
+	"undo": "\ue406",
+	"redo": "\ue405",
+	"redo-filled": "\ue7d9",
+	"bars": "\ue563",
+	"chatboxes": "\ue203",
+	"camera": "\ue301",
+	"chatboxes-filled": "\ue233",
+	"camera-filled": "\ue7ef",
+	"cart-filled": "\ue7f4",
+	"cart": "\ue7f5",
+	"checkbox-filled": "\ue442",
+	"checkbox": "\ue7fa",
+	"arrowleft": "\ue582",
+	"arrowdown": "\ue581",
+	"arrowright": "\ue583",
+	"smallcircle-filled": "\ue801",
+	"arrowup": "\ue580",
+	"circle": "\ue411",
+	"eye-filled": "\ue568",
+	"eye-slash-filled": "\ue822",
+	"eye-slash": "\ue823",
+	"eye": "\ue824",
+	"flag-filled": "\ue825",
+	"flag": "\ue508",
+	"gear-filled": "\ue532",
+	"reload": "\ue462",
+	"gear": "\ue502",
+	"hand-thumbsdown-filled": "\ue83b",
+	"hand-thumbsdown": "\ue83c",
+	"hand-thumbsup-filled": "\ue83d",
+	"heart-filled": "\ue83e",
+	"hand-thumbsup": "\ue83f",
+	"heart": "\ue840",
+	"home": "\ue500",
+	"info": "\ue504",
+	"home-filled": "\ue530",
+	"info-filled": "\ue534",
+	"circle-filled": "\ue441",
+	"chat-filled": "\ue847",
+	"chat": "\ue263",
+	"mail-open-filled": "\ue84d",
+	"email-filled": "\ue231",
+	"mail-open": "\ue84e",
+	"email": "\ue201",
+	"checkmarkempty": "\ue472",
+	"list": "\ue562",
+	"locked-filled": "\ue856",
+	"locked": "\ue506",
+	"map-filled": "\ue85c",
+	"map-pin": "\ue85e",
+	"map-pin-ellipse": "\ue864",
+	"map": "\ue364",
+	"minus-filled": "\ue440",
+	"mic-filled": "\ue332",
+	"minus": "\ue410",
+	"micoff": "\ue360",
+	"mic": "\ue302",
+	"clear": "\ue434",
+	"smallcircle": "\ue868",
+	"close": "\ue404",
+	"closeempty": "\ue460",
+	"paperclip": "\ue567",
+	"paperplane": "\ue503",
+	"paperplane-filled": "\ue86e",
+	"person-filled": "\ue131",
+	"contact-filled": "\ue130",
+	"person": "\ue101",
+	"contact": "\ue100",
+	"images-filled": "\ue87a",
+	"phone": "\ue200",
+	"images": "\ue87b",
+	"image": "\ue363",
+	"image-filled": "\ue877",
+	"location-filled": "\ue333",
+	"location": "\ue303",
+	"plus-filled": "\ue439",
+	"plus": "\ue409",
+	"plusempty": "\ue468",
+	"help-filled": "\ue535",
+	"help": "\ue505",
+	"navigate-filled": "\ue884",
+	"navigate": "\ue501",
+	"mic-slash-filled": "\ue892",
+	"search": "\ue466",
+	"settings": "\ue560",
+	"sound": "\ue590",
+	"sound-filled": "\ue8a1",
+	"spinner-cycle": "\ue465",
+	"download-filled": "\ue8a4",
+	"personadd-filled": "\ue132",
+	"videocam-filled": "\ue8af",
+	"personadd": "\ue102",
+	"upload": "\ue402",
+	"upload-filled": "\ue8b1",
+	"starhalf": "\ue463",
+	"star-filled": "\ue438",
+	"star": "\ue408",
+	"trash": "\ue401",
+	"phone-filled": "\ue230",
+	"compose": "\ue400",
+	"videocam": "\ue300",
+	"trash-filled": "\ue8dc",
+	"download": "\ue403",
+	"chatbubble-filled": "\ue232",
+	"chatbubble": "\ue202",
+	"cloud-download": "\ue8e4",
+	"cloud-upload-filled": "\ue8e5",
+	"cloud-upload": "\ue8e6",
+	"cloud-download-filled": "\ue8e9",
+	"headphones":"\ue8bf",
+	"shop":"\ue609"
+}
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..6bcc0a2
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,72 @@
+<template>
+	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="[fontFamily,fontFamily?type:'']" @click="_onClick">{{fontFamily ? '' : icons[type]}}</text>
+</template>
+
+<script>
+	import icons from './icons.js';
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('data:font/truetype;charset=utf-8;base64,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AXcBeAF5AXoBewF8AX0BfgF/AYABgQGCAYMHdW5pMDAwMAdjb250YWN0BnBlcnNvbglwZXJzb25hZGQNY29udGFjdGZpbGxlZAxwZXJzb25maWxsZWQPcGVyc29uYWRkZmlsbGVkBXBob25lBWVtYWlsCmNoYXRidWJibGUJY2hhdGJveGVzC3Bob25lZmlsbGVkC2VtYWlsZmlsbGVkEGNoYXRidWJibGVmaWxsZWQPY2hhdGJveGVzZmlsbGVkBXdlaWJvBndlaXhpbgtwZW5neW91cXVhbgRjaGF0AnFxCHZpZGVvY2FtBmNhbWVyYQNtaWMIbG9jYXRpb24JbWljZmlsbGVkDmxvY2F0aW9uZmlsbGVkBm1pY29mZgVpbWFnZQNtYXAHY29tcG9zZQV0cmFzaAZ1cGxvYWQIZG93bmxvYWQFY2xvc2UEcmVkbwR1bmRvB3JlZnJlc2gEc3Rhcgt3aGl0ZWNpcmNsZQVjbGVhcg1yZWZyZXNoZmlsbGVkCnN0YXJmaWxsZWQKcGx1c2ZpbGxlZAttaW51c2ZpbGxlZAxjaXJjbGVmaWxsZWQOY2hlY2tib3hmaWxsZWQKY2xvc2VlbXB0eQxyZWZyZXNoZW1wdHkGcmVsb2FkCHN0YXJoYWxmDHNwaW5uZXJjeWNsZQZzZWFyY2gJcGx1c2VtcHR5B2ZvcndhcmQEYmFjaw5jaGVja21hcmtlbXB0eQRob21lCG5hdmlnYXRlBGdlYXIKcGFwZXJwbGFuZQRpbmZvBGhlbHAGbG9ja2VkBG1vcmUEZmxhZwpob21lZmlsbGVkCmdlYXJmaWxsZWQKaW5mb2ZpbGxlZApoZWxwZmlsbGVkCm1vcmVmaWxsZWQIc2V0dGluZ3MEbGlzdARiYXJzBGxvb3AJcGFwZXJjbGlwCWV5ZWZpbGxlZAx1cHdhcmRzYXJyb3cOZG93bndhcmRzYXJyb3cObGVmdHdhcmRzYXJyb3cPcmlnaHR3YXJkc2Fycm93C2Fycm93dGhpbnVwDWFycm93dGhpbmRvd24NYXJyb3d0aGlubGVmdA5hcnJvd3RoaW5yaWdodAhwdWxsZG93bgVzb3VuZARzaG9wBHNjYW4KdW5kb2ZpbGxlZApyZWRvZmlsbGVkDGNhbWVyYWZpbGxlZApjYXJ0ZmlsbGVkBGNhcnQIY2hlY2tib3gRc21hbGxjaXJjbGVmaWxsZWQOZXllc2xhc2hmaWxsZWQIZXllc2xhc2gDZXllCmZsYWdmaWxsZWQVaGFuZHRodW1ic2Rvd25fZmlsbGVkDmhhbmR0aHVtYnNkb3duEmhhbmR0aHVtYnN1cGZpbGxlZAtoZWFydGZpbGxlZAxoYW5kdGh1bWJzdXAOYmxhY2toZWFydHN1aXQKY2hhdGZpbGxlZA5tYWlsb3BlbmZpbGxlZAhtYWlsb3Blbgxsb2NrZWRmaWxsZWQJbWFwZmlsbGVkBm1hcHBpbg1tYXBwaW5lbGxpcHNlC3NtYWxsY2lyY2xlEHBhcGVycGxhbmVmaWxsZWQLaW1hZ2VmaWxsZWQMaW1hZ2VzZmlsbGVkBmltYWdlcw5uYXZpZ2F0ZWZpbGxlZA5taWNzbGFzaGZpbGxlZAtzb3VuZGZpbGxlZA5kb3dubG9hZGZpbGxlZA52aWRlb2NhbWZpbGxlZAx1cGxvYWRmaWxsZWQKaGVhZHBob25lcwt0cmFzaGZpbGxlZA1jbG91ZGRvd25sb2FkEWNsb3VkdXBsb2FkZmlsbGVkC2Nsb3VkdXBsb2FkE2Nsb3VkZG93bmxvYWRmaWxsZWQHdW5pMDAwOQAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAQCFAAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANoxE3MAAAAA2jSpUA==')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @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
+			},
+			fontFamily:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/* #ifndef APP-NVUE */
+	@font-face {
+		font-family: uniicons;
+		src: url('./uni.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/uni.ttf b/uni_modules/uni-icons/components/uni-icons/uni.ttf
new file mode 100644
index 0000000..60a1968
Binary files /dev/null and b/uni_modules/uni-icons/components/uni-icons/uni.ttf differ
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..2dd573c
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.2.1",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "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": [],
+    "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..efc0a97
--- /dev/null
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,64 @@
+
+
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+
+用于展示 icons 图标 。
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+### 基本用法
+
+在 ``template`` 中使用组件
+
+```html
+<uni-icons type="contact" size="30"></uni-icons>
+```
+
+### 扩展图标用法
+
+1. 需要自行在项目 App.vue 中引入 css 图标扩展库（注意: css 图标库引用的 .ttf 文件路径是否正确）
+	
+	```html
+	<style lang="scss">
+	/* 扩展图标库 */
+	@import '@/static/iconfont.css';
+	</style>
+	```
+2. 在 ``template`` 中使用组件
+
+	```html
+	<uni-icons class="mr-30" type="icon-kongxincai" font-family="iconfont" color="#007AFF" size="20"></uni-icons>
+	```
+
+
+
+
+## API
+
+### Icons Props
+
+|属性名	|类型		|默认值	|说明				|
+|:-:	|:-:		|:-:	|:-:				|
+|size	|Number		|24		|图标大小			|
+|type	|String		|-		|图标图案，参考示例	|
+|color	|String		|-		|图标颜色			|
+|font-family(仅 vue 支持)	|String		|uniicons		|图标库字体家族			|
+
+
+### Icons Events
+|事件名	|说明			|返回值|
+|:-:	|:-:			|:-:  |
+|@click|点击 Icon 触发事件|-    |
+
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/icons/icons](https://hellouniapp.dcloud.net.cn/pages/extUI/icons/icons)
\ No newline at end of file
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..99454ba
--- /dev/null
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,37 @@
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
new file mode 100644
index 0000000..6ef26a2
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
new file mode 100644
index 0000000..291634c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,263 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholderText" :focus="focus" >
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{cancelText}}</text>
+			</view>
+			<view class="uni-dialog-button uni-border-left" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits:['confirm','close'],
+		props: {
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				focus: false,
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return t("uni-popup.ok")
+			},
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				this.val = val
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		mounted() {
+			this.focus = true
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input'){
+					this.$emit('confirm', this.val)
+				}else{
+					this.$emit('confirm')
+				}
+				if(this.beforeClose) return
+				this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if(this.beforeClose) return
+				this.popup.close()
+			},
+			close(){
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 15px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 15px;
+		padding-bottom: 5px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 5px 15px 15px 15px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6e6e6e;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 14px;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
new file mode 100644
index 0000000..f4c85e2
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
new file mode 100644
index 0000000..705902d
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,185 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				bottomData: [{
+						text: '微信',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						name: 'wx'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						name: 'sina'
+					},
+					{
+						text: '百度',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+						name: 'copy'
+					},
+					{
+						text: '其他',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+						name: 'more'
+					}
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.uni-popup-share {
+		background-color: #fff;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
new file mode 100644
index 0000000..7f1bd06
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
new file mode 100644
index 0000000..5e3003c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
new file mode 100644
index 0000000..13e39eb
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/keypress.js b/uni_modules/uni-popup/components/uni-popup/keypress.js
new file mode 100644
index 0000000..62dda46
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup/popup.js b/uni_modules/uni-popup/components/uni-popup/popup.js
new file mode 100644
index 0000000..c4e5781
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			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;
+		},
+	}
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..59698b7
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,403 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']" @touchmove.stop.prevent="clear">
+		<view @touchstart="touchstart" >
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear"><slot /></view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+// #ifdef H5
+import keypress from './keypress.js'
+// #endif
+
+/**
+ * PopUp 弹出层
+ * @description 弹出层组件，为了解决遮罩弹层的问题
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+ * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+ * 	@value top 顶部弹出
+ * 	@value center 中间弹出
+ * 	@value bottom 底部弹出
+ * 	@value left		左侧弹出
+ * 	@value right  右侧弹出
+ * 	@value message 消息提示
+ * 	@value dialog 对话框
+ * 	@value share 底部分享示例
+ * @property {Boolean} animation = [ture|false] 是否开启动画
+ * @property {Boolean} maskClick = [ture|false] 蒙版点击是否关闭弹窗
+ * @property {String}  backgroundColor 					主窗口背景色
+ * @property {Boolean} safeArea									是否适配底部安全区
+ * @event {Function} change 打开关闭弹窗触发，e={show: false}
+ * @event {Function} maskClick 点击遮罩触发
+ */
+
+export default {
+	name: 'uniPopup',
+	components: {
+		// #ifdef H5
+		keypress
+		// #endif
+	},
+	emits:['change','maskClick'],
+	props: {
+		// 开启动画
+		animation: {
+			type: Boolean,
+			default: true
+		},
+		// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+		// message: 消息提示 ; dialog : 对话框
+		type: {
+			type: String,
+			default: 'center'
+		},
+		// maskClick
+		maskClick: {
+			type: Boolean,
+			default: true
+		},
+		backgroundColor: {
+			type: String,
+			default: 'none'
+		},
+		safeArea:{
+			type: Boolean,
+			default: true
+		}
+	},
+
+	watch: {
+		/**
+		 * 监听type类型
+		 */
+		type: {
+			handler: function(type) {
+				if (!this.config[type]) return
+				this[this.config[type]](true)
+			},
+			immediate: true
+		},
+		isDesktop: {
+			handler: function(newVal) {
+				if (!this.config[newVal]) return
+				this[this.config[this.type]](true)
+			},
+			immediate: true
+		},
+		/**
+		 * 监听遮罩是否可点击
+		 * @param {Object} val
+		 */
+		maskClick: {
+			handler: function(val) {
+				this.mkclick = val
+			},
+			immediate: true
+		}
+	},
+	data() {
+		return {
+			duration: 300,
+			ani: [],
+			showPopup: false,
+			showTrans: false,
+			popupWidth: 0,
+			popupHeight: 0,
+			config: {
+				top: 'top',
+				bottom: 'bottom',
+				center: 'center',
+				left: 'left',
+				right: 'right',
+				message: 'top',
+				dialog: 'center',
+				share: 'bottom'
+			},
+			maskClass: {
+				position: 'fixed',
+				bottom: 0,
+				top: 0,
+				left: 0,
+				right: 0,
+				backgroundColor: 'rgba(0, 0, 0, 0.4)'
+			},
+			transClass: {
+				position: 'fixed',
+				left: 0,
+				right: 0
+			},
+			maskShow: true,
+			mkclick: true,
+			popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
+		}
+	},
+	computed: {
+		isDesktop() {
+			return this.popupWidth >= 500 && this.popupHeight >= 500
+		},
+		bg() {
+			if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+				return 'transparent'
+			}
+			return this.backgroundColor
+		}
+	},
+	mounted() {
+		const fixSize = () => {
+			const { windowWidth, windowHeight, windowTop, safeAreaInsets } = uni.getSystemInfoSync()
+			this.popupWidth = windowWidth
+			this.popupHeight = windowHeight + windowTop
+			// 是否适配底部安全区
+			if(this.safeArea){
+				this.safeAreaInsets = safeAreaInsets
+			}else{
+				this.safeAreaInsets = 0
+			}
+		}
+		fixSize()
+		// #ifdef H5
+		// window.addEventListener('resize', fixSize)
+		// this.$once('hook:beforeDestroy', () => {
+		// 	window.removeEventListener('resize', fixSize)
+		// })
+		// #endif
+	},
+	created() {
+		this.mkclick = this.maskClick
+		if (this.animation) {
+			this.duration = 300
+		} else {
+			this.duration = 0
+		}
+		// TODO 处理 message 组件生命周期异常的问题
+		this.messageChild = null
+		// TODO 解决头条冒泡的问题
+		this.clearPropagation = false
+	},
+	methods: {
+		/**
+		 * 公用方法，不显示遮罩层
+		 */
+		closeMask() {
+			this.maskShow = false
+		},
+		/**
+		 * 公用方法，遮罩层禁止点击
+		 */
+		disableMask() {
+			this.mkclick = false
+		},
+		// TODO nvue 取消冒泡
+		clear(e) {
+			// #ifndef APP-NVUE
+			e.stopPropagation()
+			// #endif
+			this.clearPropagation = true
+		},
+
+		open(direction) {
+			let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+			if (!(direction && innerType.indexOf(direction) !== -1)) {
+				direction = this.type
+			}
+			if (!this.config[direction]) {
+				console.error('缺少类型：', direction)
+				return
+			}
+			this[this.config[direction]]()
+			this.$emit('change', {
+				show: true,
+				type: direction
+			})
+		},
+		close(type) {
+			this.showTrans = false
+			this.$emit('change', {
+				show: false,
+				type: this.type
+			})
+			clearTimeout(this.timer)
+			// // 自定义关闭事件
+			// this.customOpen && this.customClose()
+			this.timer = setTimeout(() => {
+				this.showPopup = false
+			}, 300)
+		},
+		// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+		touchstart(){
+			this.clearPropagation = false
+		},
+
+		onTap() {
+			if (this.clearPropagation) {
+				// fix by mehaotian 兼容 nvue
+				this.clearPropagation = false
+				return
+			}
+			this.$emit('maskClick')
+			if (!this.mkclick) return
+			this.close()
+		},
+		/**
+		 * 顶部弹出样式处理
+		 */
+		top(type) {
+			this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+			this.ani = ['slide-top']
+			this.transClass = {
+				position: 'fixed',
+				left: 0,
+				right: 0,
+				backgroundColor: this.bg
+			}
+			// TODO 兼容 type 属性 ，后续会废弃
+			if (type) return
+			this.showPopup = true
+			this.showTrans = true
+			this.$nextTick(() => {
+				if (this.messageChild && this.type === 'message') {
+					this.messageChild.timerClose()
+				}
+			})
+		},
+		/**
+		 * 底部弹出样式处理
+		 */
+		bottom(type) {
+			this.popupstyle = 'bottom'
+			this.ani = ['slide-bottom']
+
+			this.transClass = {
+				position: 'fixed',
+				left: 0,
+				right: 0,
+				bottom: 0,
+				paddingBottom: (this.safeAreaInsets && this.safeAreaInsets.bottom) || 0,
+				backgroundColor: this.bg
+			}
+			// TODO 兼容 type 属性 ，后续会废弃
+			if (type) return
+			this.showPopup = true
+			this.showTrans = true
+		},
+		/**
+		 * 中间弹出样式处理
+		 */
+		center(type) {
+			this.popupstyle = 'center'
+			this.ani = ['zoom-out', 'fade']
+			this.transClass = {
+				position: 'fixed',
+				/* #ifndef APP-NVUE */
+				display: 'flex',
+				flexDirection: 'column',
+				/* #endif */
+				bottom: 0,
+				left: 0,
+				right: 0,
+				top: 0,
+				justifyContent: 'center',
+				alignItems: 'center'
+			}
+			// TODO 兼容 type 属性 ，后续会废弃
+			if (type) return
+			this.showPopup = true
+			this.showTrans = true
+		},
+		left(type) {
+			this.popupstyle = 'left'
+			this.ani = ['slide-left']
+			this.transClass = {
+				position: 'fixed',
+				left: 0,
+				bottom: 0,
+				top: 0,
+				backgroundColor: this.bg,
+				/* #ifndef APP-NVUE */
+				display: 'flex',
+				flexDirection: 'column'
+				/* #endif */
+			}
+			// TODO 兼容 type 属性 ，后续会废弃
+			if (type) return
+			this.showPopup = true
+			this.showTrans = true
+		},
+		right(type) {
+			this.popupstyle = 'right'
+			this.ani = ['slide-right']
+			this.transClass = {
+				position: 'fixed',
+				bottom: 0,
+				right: 0,
+				top: 0,
+				backgroundColor: this.bg,
+				/* #ifndef APP-NVUE */
+				display: 'flex',
+				flexDirection: 'column'
+				/* #endif */
+			}
+			// TODO 兼容 type 属性 ，后续会废弃
+			if (type) return
+			this.showPopup = true
+			this.showTrans = true
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+.uni-popup {
+	position: fixed;
+	/* #ifndef APP-NVUE */
+	z-index: 99;
+	/* #endif */
+	&.top,
+	&.left,
+	&.right {
+		/* #ifdef H5 */
+		top: var(--window-top);
+		/* #endif */
+		/* #ifndef H5 */
+		top: 0;
+		/* #endif */
+	}
+	.uni-popup__wrapper {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: relative;
+		/* iphonex 等安全区设置，底部安全区适配 */
+		/* #ifndef APP-NVUE */
+		// padding-bottom: constant(safe-area-inset-bottom);
+		// padding-bottom: env(safe-area-inset-bottom);
+		/* #endif */
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			padding-top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			padding-top: 0;
+			/* #endif */
+			flex: 1;
+		}
+	}
+}
+
+.fixforpc-z-index {
+	/* #ifndef APP-NVUE */
+	z-index: 999;
+	/* #endif */
+}
+
+.fixforpc-top {
+	top: 0;
+}
+</style>
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
new file mode 100644
index 0000000..1385af7
--- /dev/null
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,89 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.6.2",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"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-transition"
+		],
+		"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": "u"
+                }
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md
new file mode 100644
index 0000000..d8a0899
--- /dev/null
+++ b/uni_modules/uni-popup/readme.md
@@ -0,0 +1,296 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-popup-dialog`,`uni-popup-message`,`uni-popup-share`,`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
+> - 组件需要依赖 `sass` 插件 ，请自行手动安装
+> - `uni-popup-message` 、 `uni-popup-dialog` 等扩展ui组件，需要和 `uni-popup` 配套使用，暂不支持单独使用
+> - `nvue` 中使用 `uni-popup` 时，尽量将组件置于其他元素后面，避免出现层级问题
+> - `uni-popup` 并不能完全阻止页面滚动，可在打开 `uni-popup` 的时候手动去做一些处理，禁止页面滚动
+> - 如果想在页面渲染完毕后就打开 `uni-popup` ，请在 `onReady` 或 `mounted` 生命周期内调用，确保组件渲染完毕
+> - 在微信小程序开发者工具中，启用真机调试，popup 会延时出现，是因为 setTimeout 在真机调试中的延时问题导致的，预览和发布小程序不会出现此问题
+> - 使用 `npm` 方式引入组件，如果确认引用正确，但是提示未注册组件或显示不正常，请尝试重新编译项目
+> - `uni-popup` 中尽量不要使用 `scroll-view` 嵌套过多的内容，可能会影响组件的性能，导致组件无法打开或者打开卡顿
+> - `uni-popup` 不会覆盖原生 tabbar 和原生导航栏
+> - 组件支持 nvue ，需要在 `manifest.json > app-plus` 节点下配置 `"nvueStyleCompiler" : "uni-app"` 
+> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
+
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+
+### 基本用法 
+
+**示例**
+
+```html
+<button @click="open">打开弹窗</button>
+<uni-popup ref="popup" type="bottom">底部弹出 Popup</uni-popup>
+```
+
+```javascript
+export default {
+   methods:{
+      open(){
+        // 通过组件定义的ref调用uni-popup方法 ,如果传入参数 ，type 属性将失效 ，仅支持 ['top','left','bottom','right','center']
+        this.$refs.popup.open('top')
+      }
+   }
+}
+
+```
+
+### 设置主窗口背景色
+
+在大多数场景下，并不需要设置 `background-color` 属性，因为`uni-popup`的主窗口默认是透明的，在向里面插入内容的时候 ，样式完全交由用户定制，如果设置了背景色 ，例如 `uni-popup-dialog` 中的圆角就很难去实现，不设置背景色，更适合用户去自由发挥。
+
+而也有特例，需要我们主动去设置背景色，例如 `type = 'bottom'` 的时候 ，在异型屏中遇到了底部安全区问题（如 iphone 11），因为 `uni-popup`的主要内容避开了安全区（设置`safe-area:true`），导致底部的颜色我们无法自定义，这时候使用 `background-color` 就可以解决这个问题。 
+
+**示例**
+
+```html
+<button @click="open">打开弹窗</button>
+<uni-popup ref="popup" type="bottom" background-color="#fff">底部弹出 Popup</uni-popup>
+```
+
+### 禁用打开动画
+在某些场景 ，可能不希望弹层有动画效果 ，只需要将 `animation` 属性设置为 `false` 即可以关闭动画。
+
+**示例**
+
+```html
+<button @click="open">打开弹窗</button>
+<uni-popup ref="popup" type="center" :animation="false">中间弹出 Popup</uni-popup>
+```
+
+### 禁用点击遮罩关闭
+默认情况下，点击遮罩会自动关闭`uni-popup`，如不想点击关闭，只需将`mask-click`设置为`false`，这时候要关闭`uni-popup`，只能手动调用 `close` 方法。
+
+**示例**
+
+```html
+<button @click="open">打开弹窗</button>
+<uni-popup ref="popup" :mask-click="false">
+	<text>Popup</text>
+	<button @click="close">关闭</button>
+</uni-popup>
+```
+
+```javascript
+export default {
+	data() {
+		return {}
+	},
+	onReady() {},
+	methods: {
+		open() {
+			this.$refs.popup.open('top')
+		},
+		close() {
+			this.$refs.popup.close()
+		}
+	}
+}
+
+```
+
+## API
+
+### Popup Props 
+
+|属性名|类型|默认值|说明|
+|:-:|:-:|:-:|:-:|
+|animation|Boolean|true|是否开启动画|
+|type|String|'center'|弹出方式|
+|mask-click|Boolean|true|蒙版点击是否关闭弹窗|
+|background-color|String|'none'|主窗口背景色|
+|safe-area|Boolean|true|是否适配底部安全区|
+
+#### Type Options
+
+|属性名|说明|
+|:-:| :-:|
+|top|顶部弹出	|
+|center|居中弹出|
+|bottom|底部弹出|
+|left|左侧弹出|
+|right|右侧弹出|
+|message|预置样式 ：消息提示|
+|dialog|预置样式 ：对话框|
+|share|预置样式 ：底部弹出分享示例	|
+
+
+### Popup Methods
+
+|方法称名	|说明|参数|
+|:-:|:-:|:-:|
+|open|打开弹出层|open(String:type) ，如果参数可代替 type 属性|
+|close|关闭弹出层	|-|
+
+
+### Popup Events
+
+|事件称名|说明|返回值|
+|:-:|:-:|:-:|
+|change|组件状态发生变化触发|e={show: true｜false,type:当前模式}|
+|maskClick|点击遮罩层触发|-|
+
+
+## 扩展组件说明
+`uni-popup` 其实并没有任何样式，只提供基础的动画效果，给用户一个弹出层解决方案，仅仅是这样并不能满足开发需求，所以我们提供了三种基础扩展样式
+
+### uni-popup-message 提示信息
+
+将 `uni-popup` 的`type`属性改为 `message`，并引入对应组件即可使用消息提示 ，*该组件不支持单独使用*
+
+**示例**
+
+```html
+<uni-popup ref="popup" type="message">
+	<uni-popup-message type="success" message="成功消息" :duration="2000"></uni-popup-message>
+</uni-popup>
+```
+
+### PopupMessage Props
+
+|属性名|类型|默认值|说明|
+|:-:|:-:|:-:|:-:|
+|type|String|success|消息提示主题|
+|message|String|-|消息提示文字|
+|duration|Number|3000|消息显示时间，超过显示时间组件自动关闭，设置为0 将不会关闭，需手动调用 close 方法关闭|
+
+#### Type Options
+
+|属性名|说明|
+|:-:| :-:|
+|success|成功	|
+|warn|警告|
+|error|失败|
+|info|消息|
+
+### PopupMessage Slots
+
+|名称|说明|					
+|:-:|:-:|						
+|default|消息内容，会覆盖 message 属性|
+
+### uni-popup-dialog 对话框
+
+将 `uni-popup` 的`type`属性改为 `dialog`，并引入对应组件即可使用对话框 ，*该组件不支持单独使用*
+
+**示例**
+
+```html
+<button @click="open">打开弹窗</button>
+<uni-popup ref="popup" type="dialog">
+	<uni-popup-dialog mode="input" message="成功消息" :duration="2000" :before-close="true" @close="close" @confirm="confirm"></uni-popup-dialog>
+</uni-popup>
+```
+
+```javascript
+export default {
+	methods: {
+		open() {
+			this.$refs.popup.open()
+		},
+		/**
+		 * 点击取消按钮触发
+		 * @param {Object} done
+		 */
+		close() {
+			// TODO 做一些其他的事情，before-close 为true的情况下，手动执行 close 才会关闭对话框
+			// ...
+			this.$refs.popup.close()
+		},
+		/**
+		 * 点击确认按钮触发
+		 * @param {Object} done
+		 * @param {Object} value
+		 */
+		confirm(value) {
+			// 输入框的值
+			console.log(value)
+			// TODO 做一些其他的事情，手动执行 close 才会关闭对话框
+			// ...
+			this.$refs.popup.close()
+		}
+	}
+}
+```
+
+### PopupDialog Props
+
+|属性名|类型|默认值|说明|
+|:-:|:-:|:-:|:-:|
+|type|String|success|对话框标题主题，可选值： success/warn/info/error|
+|mode|String|base| 对话框模式，可选值：base（提示对话框）/input（可输入对话框）|
+|title|String|-|对话框标题|
+|content|String|-|对话框内容，base模式下生效|
+|value| String\Number|-|输入框默认值，input模式下生效|
+|placeholder|String|-|输入框提示文字，input模式下生效|
+|before-close|Boolean|false	| 是否拦截按钮事件，如为true，则不会关闭对话框，关闭需要手动执行 uni-popup 的 close 方法|
+
+#### PopupDialog Events
+
+|事件称名	|说明|返回值|
+|:-:|:-:|:-:|
+|close|点击dialog取消按钮触发|-|
+|confirm|点击dialog确定按钮触发|e={value:input模式下输入框的值}|
+
+### PopupDialog Slots
+
+|名称|说明|					
+|:-:|:-:|						
+|default|自定义内容，回覆盖原有的内容显示|
+
+### uni-popup-share 分享示例
+
+分享示例，不作为最终可使用的组件，只做为样式组件，供用户自行修改，`后续的开发计划是实现实际的分享逻辑，参数可配置`。
+
+将 `uni-popup` 的 `type` 属性改为 `share`，并引入对应组件即可使用 ，*该组件不支持单独使用*
+
+**示例**
+
+```html
+<uni-popup ref="popup" type="share">
+	<uni-popup-share title="分享到" @select="select"></uni-popup-share>
+</uni-popup>
+```
+
+### PopupShare Props
+
+|属性名|类型|默认值|说明|
+|:-:|:-:|:-:| :-:			|
+|title|String|-|分享弹窗标题|
+|before-close|Boolean|false	| 是否拦截按钮事件，如为true，则不会关闭对话框，关闭需要手动执行 uni-popup 的 close 方法|
+
+### PopupShare Events
+
+|事件称名|说明|返回值|
+|:-:|:-:|:-:|
+|select|选择触发|e = {item,index}：所选参数|
+
+**Tips**
+- share 分享组件，只是作为一个扩展示例，如果需要修改数据源，请到组件内修改
+
+## 帮助
+在使用中如遇到无法解决的问题，请提 [Issues](https://github.com/dcloudio/uni-ui/issues) 给我们。
+
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/popup/popup](https://hellouniapp.dcloud.net.cn/pages/extUI/popup/popup)
\ No newline at end of file
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
new file mode 100644
index 0000000..dca8178
--- /dev/null
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,13 @@
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 0000000..5f54365
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,128 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		this.animation = uni.createAnimation(options)
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}
diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..69ff9d9
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,277 @@
+<template>
+	<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj))
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 1 : 0,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
new file mode 100644
index 0000000..0a709c9
--- /dev/null
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,83 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.2.0",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "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": [],
+    "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"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md
new file mode 100644
index 0000000..f398623
--- /dev/null
+++ b/uni_modules/uni-transition/readme.md
@@ -0,0 +1,397 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+> **注意事项**
+> 为了避免错误使用，给大家带来不好的开发体验，请在使用组件前仔细阅读下面的注意事项，可以帮你避免一些错误。
+> - 组件需要依赖 `sass` 插件 ，请自行手动安装
+> - rotate 旋转动画不需要填写 deg 单位，在小程序上填写单位动画不会执行
+> - NVUE 下修改宽高动画，不能定位到中心点
+> - 百度小程序下修改宽高 ，可能会影响其他动画，需注意
+> - nvue 不支持 costom-class , 请使用 styles
+> - 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
+
+
+### 安装方式
+
+本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范，`HBuilderX 2.5.5`起，只需将本组件导入项目，在页面`template`中即可直接使用，无需在页面中`import`和注册`components`。
+
+如需通过`npm`方式使用`uni-ui`组件，另见文档：[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55)
+
+### 基本用法
+
+在 ``template`` 中使用组件
+
+```html
+<template>
+	<view>
+		<button type="primary" @click="open">fade</button>
+		<uni-transition mode-class="fade" :styles="{'width':'100px','height':'100px','backgroundColor':'red'}" :show="show" @change="change" />
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			show: false,
+		}
+	},
+	onLoad() {},
+	methods: {
+		open(mode) {
+			this.show = !this.show
+		},
+		change() {
+			console.log('触发动画')
+		}
+	}
+}
+</script>
+```
+
+### 样式覆盖
+
+**注意：`nvue` 不支持 `custom-class` 属性 ，需要使用 `styles` 属性进行兼容**
+
+使用 `custom-class` 属性绑定样式，可以自定义 `uni-transition` 的样式
+
+```html
+<template>
+	<view class="content">
+		<uni-transition custom-class="custom-transition" mode-class="fade" :duration="0" :show="true" />
+	</view>
+</template>
+
+<style>
+/* 常规样式覆盖  */
+.content >>> .custom-transition {
+	width:100px;
+	height:100px;
+	background-color:red;
+}
+</style>
+<style lang="scss">
+/* 如果使用 scss 需要使用 /deep/  */
+.content /deep/ .custom-transition {
+	width:100px;
+	height:100px;
+	background-color:red;
+}
+</style>
+```
+
+
+如果使用 `styles` 注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+
+```html
+<template>
+	<view class="content">
+		<uni-transition :styles="styles" mode-class="fade" :duration="0" :show="true" />
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			styles:{
+				'width':'100px',
+				'height':'100px',
+				'backgroundColor':'red'
+			}
+		}
+	}
+}
+</script>
+```
+
+### 自定义动画
+当内置动画类型不能满足需求的时候 ，可以使用 `step()` 和 `run()` 自定义动画,入参以及具体用法参考下方属性说明
+
+`init()` 方法可以覆盖默认配置
+
+
+```html
+<template>
+	<view>
+		<button type="primary" @click="run">执行动画</button>
+		<uni-transition ref="ani" :styles="{'width':'100px','height':'100px','backgroundColor':'red'}" :show="show"  />
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			show: true,
+		}
+	},
+	onReady() {
+		this.$refs.ani.init({
+			duration: 1000,
+			timingFunction: 'linear',
+			transformOrigin: '50% 50%',
+			delay: 500
+		})
+	},
+	methods: {
+		run() {
+			// 同时右平移到 100px,旋转 360 读
+			this.$refs.ani.step({
+				translateX: '100px',
+				rotate: '360'
+			})
+			// 上面的动画执行完成后，等待200毫秒平移到 0px,旋转到 0 读
+			this.$refs.ani.step({
+				translateX: '0px',
+				rotate: '0'
+			},
+			{
+				timingFunction: 'ease-in',
+				duration: 200
+			})
+			// 开始执行动画
+			this.$refs.ani.run(()=>{
+				console.log('动画支持完毕')
+			})
+		}
+	}
+}
+</script>
+```
+
+
+## API
+
+### Transition Props
+
+|属性名		|类型	|默认值	|说明					|
+|:-:	|:-:	|:-:					|:-:|
+|show				|Boolean|false	|控制组件显示或隐藏	|
+|mode-class |Array/String	|-		|内置过渡动画类型			|
+|custom-class |String	|-		|自定义类名	|
+|duration	 |Number	|300	|过渡动画持续时间		|
+|styles		 |Object	|-		|组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`	|
+
+#### mode-class 内置过渡动画类型说明
+**格式为** ：`'fade'` 或者 `['fade','slide-top']`
+
+|属性名			|说明			|
+|:-:			|:-:			|
+|fade			|渐隐渐出过渡	|
+|slide-top		|由上至下过渡	|
+|slide-right	|由右至左过渡	|
+|slide-bottom	|由下至上过渡	|
+|slide-left		|由左至右过渡	|
+|zoom-in		|由小到大过渡	|
+|zoom-out		|由大到小过渡	|
+
+**注意** 
+
+组合使用时，同一种类型相反的过渡动画如（slide-top、slide-bottom）同时使用时，只有最后一个生效
+
+### Transition Events
+
+|事件名		|说明				|返回值			|
+|:-:			|:-:				|:-:			|
+|click		|点击组件触发		|-				|
+|change		|过渡动画结束时触发	| e = {detail:true}	|
+
+### Transition Methons
+
+|方法名|说明|参数|
+|:-:|:-:|:-:|
+|init()|手动初始化配置|Function(OBJECT:config)|
+|step()|动画队列|Function(OBJECT:type,OBJECT:config)|
+|run()|执行动画|Function(FUNCTION:callback)	|
+
+### init(OBJECT:config)
+**通过 ref 调用方法**
+
+手动设置动画配置，需要在页面渲染完毕后调用
+
+```javascript
+this.$refs.ani.init({
+	duration: 1000,
+	timingFunction:'ease',
+	delay:500,
+	transformOrigin:'left center'
+})
+```
+
+### step(OBJECT:type,OBJECT:config) 动画队列
+**通过 ref 调用方法**
+
+调用 `step()` 来表示一组动画完成，`step` 第一个参数可以传入任意多个动画方法，一组动画中的所有动画会同时开始，一组动画完成后才会进行下一组动画。`step` 第二个参数可以传入一个跟 `uni.createAnimation()` 一样的配置参数用于指定当前组动画的配置。
+
+Tips
+- 第一个参数支持的动画参考下面的 `支持的动画`
+- 第二个参数参考下面的 `动画配置`，可省略，如果省略继承`init`的配置
+
+
+```javascript
+this.$refs.ani.step({
+	translateX: '100px'
+},{
+	duration: 1000,
+	timingFunction:'ease',
+	delay:500,
+	transformOrigin:'left center'
+})
+```
+
+### run(FUNCTION:callback) 执行动画
+**通过 ref 调用方法**
+
+在执行 `step()` 后，需要调用 `run()` 来运行动画 ，否则动画会一直等待
+
+`run()` 方法可以传入一个 `callback` 函数 ，会在所有动画执行完毕后回调
+
+```javascript
+this.$refs.ani.step({
+	translateX: '100px'
+})
+this.$refs.ani.run(()=>{
+	console.log('动画执行完毕')
+})
+
+```
+
+### 动画配置
+动画配置 ， `init()` 与 `step()` 第二个参数配置相同 ，如果配置`step() `第二个参数，将会覆盖 `init()` 的配置
+
+|属性名|值|必填|默认值|说明|平台差异|
+|:-:|:-:|:-:|:-:|:-:|:-:|
+|duration|Number|否|400|动画持续时间，单位ms|-|
+|timingFunction|String|否|"linear"|定义动画的效果|-|
+|delay|Number|否|0|动画延迟时间，单位 ms|-|
+|needLayout|Boolean|否|false	|动画执行是否影响布局|仅 nvue 支持|
+|transformOrigin|String	|否|"center center"|设置	[transform-origin](https://developer.mozilla.org/en-US/docs/Web/CSS/transform-origin)|-|
+
+
+### timingFunction 属性说明
+
+|值|说明|平台差异|
+|:-:|:-:|:-:|
+|linear|动画从头到尾的速度是相同的|-|
+|ease|动画以低速开始，然后加快，在结束前变慢|-|
+|ease-in|	动画以低速开始|-|
+|ease-in-out|	动画以低速开始和结束|-|
+|ease-out|动画以低速结束|-|
+|step-start|动画第一帧就跳至结束状态直到结束|nvue不支持|
+|step-end|动画一直保持开始状态，最后一帧跳到结束状态|nvue不支持|
+
+```javascript
+// init 配置
+this.$refs.ani.init({
+	duration: 1000,
+	timingFunction:'ease',
+	delay:500,
+	transformOrigin:'left center'
+})
+// step 配置
+this.$refs.ani.step({
+	translateX: '100px'
+},{
+	duration: 1000,
+	timingFunction:'ease',
+	delay:500,
+	transformOrigin:'left center'
+})
+```
+
+### 支持的动画
+动画方法 
+
+如果同一个动画方法有多个值，多个值使用数组分隔
+
+```javascript
+this.$refs.ani.step({
+	width:'100px',
+	scale: [1.2,0.8],
+})
+```
+
+**样式：**
+
+|属性名|值|说明|平台差异|
+|:-:|:-:|:-:|:-:|
+|opacity|value|透明度，参数范围 0~1|-|
+|backgroundColor|color|颜色值|-|
+|width|length|长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值|-|
+|height|length|长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值|-|
+|top|length|长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值|nvue 不支持|
+|left|length|长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值|nvue 不支持|
+|bottom|length|长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值|nvue 不支持|
+|right|length|长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值|nvue 不支持|
+
+```javascript
+this.$refs.ani.step({
+	opacity: 1,
+	backgroundColor: '#ff5a5f',
+	widht:'100px',
+	height:'50rpx',
+})
+```
+
+**旋转：**
+
+旋转属性的值不需要填写单位
+
+|属性名|值|说明|平台差异	|
+|:-:|:-:|:-:|:-:|
+|rotate|deg|deg的范围-180~180，从原点顺时针旋转一个deg角度	|-|
+|rotateX|deg|deg的范围-180~180，在X轴旋转一个deg角度				|-|
+|rotateY|deg|deg的范围-180~180，在Y轴旋转一个deg角度				|-|
+|rotateZ|deg|deg的范围-180~180，在Z轴旋转一个deg角度				|nvue不支持|
+|rotate3d|x,y,z,deg| 同	[transform-function rotate3d](https://developer.mozilla.org/en-US/docs/Web/CSS/transform-function/rotate3d())		|nvue不支持|
+
+```javascript
+this.$refs.ani.step({
+	rotateX: 45,
+	rotateY: 45
+})
+```
+
+**缩放：**
+
+|属性名|值|说明|平台差异|
+|:-:|:-:|:-:	|:-:|
+|scale|sx,[sy]|一个参数时，表示在X轴、Y轴同时缩放sx倍数；两个参数时表示在X轴缩放sx倍数，在Y轴缩放sy倍数|-|
+|scaleX|sx|在X轴缩放sx倍数|-|
+|scaleY|sy|在Y轴缩放sy倍数|-|
+|scaleZ|sz|在Z轴缩放sy倍数|nvue不支持|
+|scale3d|sx,sy,sz|在X轴缩放sx倍数，在Y轴缩放sy倍数，在Z轴缩放sz倍数|nvue不支持|
+
+```javascript
+this.$refs.ani.step({
+	scale: [1.2,0.8]
+})
+```
+
+**偏移：**
+
+|属性名|值|说明|平台差异|
+|:-:|:-:|:-:|:-:|
+|translate|tx,[ty]|一个参数时，表示在X轴偏移tx，单位px；两个参数时，表示在X轴偏移tx，在Y轴偏移ty，单位px。|-|
+|translateX|tx|	在X轴偏移tx，单位px|-|
+|translateY|ty|	在Y轴偏移tx，单位px|-|
+|translateZ|tz|	在Z轴偏移tx，单位px|nvue不支持|
+|translate3d|tx,ty,tz|	在X轴偏移tx，在Y轴偏移ty，在Z轴偏移tz，单位px|nvue不支持|
+
+```javascript
+this.$refs.ani.step({
+	translateX: '100px'
+})
+```
+
+
+
+## 组件示例
+
+点击查看：[https://hellouniapp.dcloud.net.cn/pages/extUI/transition/transition](https://hellouniapp.dcloud.net.cn/pages/extUI/transition/transition)
\ No newline at end of file