From 9b9adef49f980647c81b816e15523fb451f39aff Mon Sep 17 00:00:00 2001
From: zhangjing <zhangjing@uztech.com>
Date: Fri, 7 Jul 2023 19:04:26 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0=E9=82=80=E8=AF=B7=E7=A0=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                        |   16 +
 apis/index.js                                 |   39 +-
 apis/interfaces/index.js                      |  138 +-
 pages/index/clients.vue                       | 1123 +++++-----
 pages/index/index.vue                         | 1922 +++++++++--------
 pages/result/history.vue                      | 1475 +++++++------
 pages/result/other.vue                        |  561 ++---
 pages/result/result.vue                       | 1288 +++++------
 scss/globa.scss                               |   81 +
 uni.scss                                      |   84 +-
 uni_modules/oct-mechanism-picker/changelog.md |    0
 .../oct-mechanism-picker.vue                  |  178 ++
 uni_modules/oct-mechanism-picker/package.json |   81 +
 uni_modules/oct-mechanism-picker/readme.md    |    1 +
 uni_modules/uni-data-picker/changelog.md      |   68 +
 .../components/uni-data-picker/keypress.js    |   45 +
 .../uni-data-picker/uni-data-picker.vue       |  554 +++++
 .../uni-data-pickerview/uni-data-picker.js    |  563 +++++
 .../uni-data-pickerview.vue                   |  335 +++
 uni_modules/uni-data-picker/package.json      |   90 +
 uni_modules/uni-data-picker/readme.md         |   22 +
 uni_modules/uni-icons/changelog.md            |   22 +
 .../uni-icons/components/uni-icons/icons.js   | 1169 ++++++++++
 .../components/uni-icons/uni-icons.vue        |   96 +
 .../components/uni-icons/uniicons.css         |  663 ++++++
 .../components/uni-icons/uniicons.ttf         |  Bin 0 -> 35760 bytes
 uni_modules/uni-icons/package.json            |   86 +
 uni_modules/uni-icons/readme.md               |    8 +
 uni_modules/uni-load-more/changelog.md        |   19 +
 .../components/uni-load-more/i18n/en.json     |    5 +
 .../components/uni-load-more/i18n/index.js    |    8 +
 .../uni-load-more/i18n/zh-Hans.json           |    5 +
 .../uni-load-more/i18n/zh-Hant.json           |    5 +
 .../uni-load-more/uni-load-more.vue           |  399 ++++
 uni_modules/uni-load-more/package.json        |   86 +
 uni_modules/uni-load-more/readme.md           |   14 +
 uni_modules/uni-popup/changelog.md            |   66 +
 .../components/uni-popup-dialog/keypress.js   |   45 +
 .../uni-popup-dialog/uni-popup-dialog.vue     |  275 +++
 .../uni-popup-message/uni-popup-message.vue   |  143 ++
 .../uni-popup-share/uni-popup-share.vue       |  187 ++
 .../components/uni-popup/i18n/en.json         |    7 +
 .../components/uni-popup/i18n/index.js        |    8 +
 .../components/uni-popup/i18n/zh-Hans.json    |    7 +
 .../components/uni-popup/i18n/zh-Hant.json    |    7 +
 .../components/uni-popup/keypress.js          |   45 +
 .../uni-popup/components/uni-popup/popup.js   |   26 +
 .../components/uni-popup/uni-popup.vue        |  474 ++++
 uni_modules/uni-popup/package.json            |   87 +
 uni_modules/uni-popup/readme.md               |   17 +
 uni_modules/uni-scss/changelog.md             |    8 +
 uni_modules/uni-scss/index.scss               |    1 +
 uni_modules/uni-scss/package.json             |   82 +
 uni_modules/uni-scss/readme.md                |    4 +
 uni_modules/uni-scss/styles/index.scss        |    7 +
 .../uni-scss/styles/setting/_border.scss      |    3 +
 .../uni-scss/styles/setting/_color.scss       |   66 +
 .../uni-scss/styles/setting/_radius.scss      |   55 +
 .../uni-scss/styles/setting/_space.scss       |   56 +
 .../uni-scss/styles/setting/_styles.scss      |  167 ++
 .../uni-scss/styles/setting/_text.scss        |   24 +
 .../uni-scss/styles/setting/_variables.scss   |  146 ++
 .../uni-scss/styles/tools/functions.scss      |   19 +
 uni_modules/uni-scss/theme.scss               |   31 +
 uni_modules/uni-scss/variables.scss           |   62 +
 uni_modules/uni-transition/changelog.md       |   20 +
 .../uni-transition/createAnimation.js         |  128 ++
 .../uni-transition/uni-transition.vue         |  277 +++
 uni_modules/uni-transition/package.json       |   87 +
 uni_modules/uni-transition/readme.md          |   11 +
 70 files changed, 10722 insertions(+), 3175 deletions(-)
 create mode 100644 .hbuilderx/launch.json
 create mode 100644 scss/globa.scss
 create mode 100644 uni_modules/oct-mechanism-picker/changelog.md
 create mode 100644 uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue
 create mode 100644 uni_modules/oct-mechanism-picker/package.json
 create mode 100644 uni_modules/oct-mechanism-picker/readme.md
 create mode 100644 uni_modules/uni-data-picker/changelog.md
 create mode 100644 uni_modules/uni-data-picker/components/uni-data-picker/keypress.js
 create mode 100644 uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
 create mode 100644 uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
 create mode 100644 uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
 create mode 100644 uni_modules/uni-data-picker/package.json
 create mode 100644 uni_modules/uni-data-picker/readme.md
 create mode 100644 uni_modules/uni-icons/changelog.md
 create mode 100644 uni_modules/uni-icons/components/uni-icons/icons.js
 create mode 100644 uni_modules/uni-icons/components/uni-icons/uni-icons.vue
 create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons.css
 create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons.ttf
 create mode 100644 uni_modules/uni-icons/package.json
 create mode 100644 uni_modules/uni-icons/readme.md
 create mode 100644 uni_modules/uni-load-more/changelog.md
 create mode 100644 uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
 create mode 100644 uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
 create mode 100644 uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
 create mode 100644 uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
 create mode 100644 uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
 create mode 100644 uni_modules/uni-load-more/package.json
 create mode 100644 uni_modules/uni-load-more/readme.md
 create mode 100644 uni_modules/uni-popup/changelog.md
 create mode 100644 uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/en.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/index.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/keypress.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/popup.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/uni-popup.vue
 create mode 100644 uni_modules/uni-popup/package.json
 create mode 100644 uni_modules/uni-popup/readme.md
 create mode 100644 uni_modules/uni-scss/changelog.md
 create mode 100644 uni_modules/uni-scss/index.scss
 create mode 100644 uni_modules/uni-scss/package.json
 create mode 100644 uni_modules/uni-scss/readme.md
 create mode 100644 uni_modules/uni-scss/styles/index.scss
 create mode 100644 uni_modules/uni-scss/styles/setting/_border.scss
 create mode 100644 uni_modules/uni-scss/styles/setting/_color.scss
 create mode 100644 uni_modules/uni-scss/styles/setting/_radius.scss
 create mode 100644 uni_modules/uni-scss/styles/setting/_space.scss
 create mode 100644 uni_modules/uni-scss/styles/setting/_styles.scss
 create mode 100644 uni_modules/uni-scss/styles/setting/_text.scss
 create mode 100644 uni_modules/uni-scss/styles/setting/_variables.scss
 create mode 100644 uni_modules/uni-scss/styles/tools/functions.scss
 create mode 100644 uni_modules/uni-scss/theme.scss
 create mode 100644 uni_modules/uni-scss/variables.scss
 create mode 100644 uni_modules/uni-transition/changelog.md
 create mode 100644 uni_modules/uni-transition/components/uni-transition/createAnimation.js
 create mode 100644 uni_modules/uni-transition/components/uni-transition/uni-transition.vue
 create mode 100644 uni_modules/uni-transition/package.json
 create mode 100644 uni_modules/uni-transition/readme.md

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..7d4caab
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/apis/index.js b/apis/index.js
index 8c2dd13..5547492 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -1,14 +1,15 @@
-
+
 /**
  * 手太欠
  * 愿这世界都如故事里一样 美好而动人~
- */
+ */
 
-import store from '@/store'
+import store from '@/store'
 
 // 基础配置
-const config = {
-	apiUrl    : 'http://debt.douhuofalv.com/api/',  // 正式环境
+const config = {
+	// apiUrl    : 'http://debt.douhuofalv.com/api/',  // 备份环境
+	apiUrl    : 'http://api.xchengwh9.cn/api/',  // 正式环境
 	timeout	: 60000
 }
 
@@ -28,13 +29,13 @@ const request = (parameter, hideLoding) => {
 	config.header = {
 		'Accept': 'application/json',
 		'Authorization': store.getters.getToken || ''
-	}
-    
-    // 加载提示
-    if(!hideLoding) uni.showLoading({
-        title: '加载中',
-        mask : true
-    });
+	}
+    
+    // 加载提示
+    if(!hideLoding) uni.showLoading({
+        title: '加载中',
+        mask : true
+    });
     
 	// 请求实例
 	return new Promise((resolve, reject) => {
@@ -69,7 +70,7 @@ const request = (parameter, hideLoding) => {
 }
 
 // 文件上传
-const uploading = (paths, driver) => {
+const uploading = (paths, driver) => {
 	
 	uni.showLoading({
 	    title: '上传中',
@@ -81,13 +82,13 @@ const uploading = (paths, driver) => {
 		'Authorization': store.getters.getToken || ''
 	}
 	// 上传图片
-	return new Promise((resolve, reject) => {
+	return new Promise((resolve, reject) => {
 		uni.uploadFile({
 			url		: config.apiUrl + 'storage/uploads',
 			files	: paths,
-			header	: config.header || {},
+			header	: config.header || {},
 			formData: driver || {},
-			success : res=>{
+			success : res=>{
 				if(res.statusCode === 200){
 					uni.hideLoading()
 					let updData = JSON.parse(res.data)
@@ -143,10 +144,10 @@ const loginHint = () => {
 		content: '您的登录信息已过期，请重新登录',
 		confirmColor: '#8b64fd',
 		showCancel:false,
-		success: res=> {
+		success: res=> {
 			loginHintState = false
-			if (res.confirm) uni.reLaunch({
-				url:'/pages/index/index'
+			if (res.confirm) uni.reLaunch({
+				url:'/pages/index/index'
 			})
 		}
 	})
diff --git a/apis/interfaces/index.js b/apis/interfaces/index.js
index b645055..ba5cb10 100644
--- a/apis/interfaces/index.js
+++ b/apis/interfaces/index.js
@@ -1,67 +1,77 @@
 /**
  * 手太欠
  * 愿这世界都如故事里一样 美好而动人~
- */
-
-import { request } from '../index'
-
-// 计算前置接口
-const Init = (data) => {
-    return request({
-        url : 'init',
-		data: data
-    })
-}
-
-
-// 开始计算
-const Debt = (data) => {
-    return request({
-        url : 'debt',
-		method: 'POST',
-		data: data
-    })
-}
-
-// 完善用户信息
-const Info = (data) => {
-    return request({
-        url : 'userinfo',
-		method: 'POST',
-		data: data
-    })
-}
-
-// 查看结果
-const Lists = (data) => {
-    return request({
-        url : 'lists',
-		data: data
-    })
-}
-
-// 客户管理
-const Clients = (data) => {
-    return request({
-        url : 'clients',
-		data: data
-    })
-}
-
-// 删除结果
-const logDel = (log_id) => {
-    return request({
-        url : 'debt/' + log_id,
-		method: 'DELETE'
-    })
-}
-
-
-export {
-	Init,
-	Debt,
-	Info,
-	Lists,
-	Clients,
-	logDel
-}
+ */
+
+import { request } from '../index'
+
+// 计算前置接口
+const Init = (data) => {
+    return request({
+        url : 'init',
+		data: data
+    })
+}
+
+
+// 开始计算
+const Debt = (data) => {
+    return request({
+        url : 'debt',
+		method: 'POST',
+		data: data
+    })
+}
+
+// 完善用户信息
+const Info = (data) => {
+    return request({
+        url : 'userinfo',
+		method: 'POST',
+		data: data
+    })
+}
+
+// 查看结果
+const Lists = (data) => {
+    return request({
+        url : 'lists',
+		data: data
+    })
+}
+
+// 客户管理
+const Clients = (data) => {
+    return request({
+        url : 'clients',
+		data: data
+    })
+}
+
+// 删除结果
+const logDel = (log_id) => {
+    return request({
+        url : 'debt/' + log_id,
+		method: 'DELETE'
+    })
+}
+
+
+// 测试获取第一个用户的token
+const userTest = () => {
+    return request({
+        url : 'user/auth/official/test',
+		method: 'POST'
+    })
+}
+
+
+export {
+	Init,
+	Debt,
+	Info,
+	Lists,
+	Clients,
+	logDel,
+	userTest
+}
diff --git a/pages/index/clients.vue b/pages/index/clients.vue
index 2d1599e..9593560 100644
--- a/pages/index/clients.vue
+++ b/pages/index/clients.vue
@@ -1,565 +1,566 @@
-<template>
-	<view class="content">
-		<block v-if="listsArr.length > 0">
-			<image class="indexTop" src="/static/index_top.png" mode="scaleToFill"></image>
-			<view class="indexTips">
-				<view class="indexTips-name">计算历史记录</view>
-				<view class="indexTips-text">根据您填写的内容生成以下结果</view>
-			</view>
-			<view class="indexCont">
-				<view class="indexCont-white" v-for="(item, index) in listsArr" :key="index">
-					<view class="resultTitle">
-						{{item.institution}}
-					</view>
-					<view class="resultList">
-						<view class="item">
-							<view class="item-label">
-								<view class="item-label-name">
-									欠款金额：
-								</view>
-								<view class="item-label-text">
-									{{item.total}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									首付金额：
-								</view>
-								<view class="item-label-text" v-if="item.base">
-									{{item.base.first_amount}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									分期金额：
-								</view>
-								<view class="item-label-text" v-if="item.base">
-									{{item.base.periods_amount}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									分期期数：
-								</view>
-								<view class="item-label-text" v-if="item.base">
-									{{item.base.periods}}期
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									手续费费率：
-								</view>
-								<view class="item-label-text" v-if="item.base">
-									{{item.base.tax}}%
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									每期还款本金：
-								</view>
-								<view class="item-label-text" v-if="item.base">
-									{{item.base.every_total}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									每期还款手续费：
-								</view>
-								<view class="item-label-text" v-if="item.base">
-									{{item.base.every_tax}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									总还款金额：
-								</view>
-								<view class="item-label-text" v-if="item.base">
-									{{item.base.total}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									总还款本金：
-								</view>
-								<view class="item-label-text" v-if="item.base">
-									{{item.base.principal}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									总还款手续费：
-								</view>
-								<view class="item-label-text" v-if="item.base">
-									{{item.base.tax_amount}}元
-								</view>
-							</view>
-						</view>
-						<view class="tips">温馨提示：{{item.description}}</view>
-						<view class="see">
-							<view class="see-go" @click="generalClick(item)">点击查看还款计划表</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</block>
-		<view class="pack-center pages-hint" v-else>
-		    <image src="https://cdn.shuiganying.com/images/2023/04/04/40b2f4bfe2dfb828688fcd3766d6b541.png"></image>
-		    <view class="reportTips">
-		        <view class="reportTips-title">暂无数据</view>
-		        <view class="reportTips-text">抱歉，暂没有历史记录</view>
-		    </view>
-		</view>
-		
-		<!-- 还款计划表弹出 -->
-		<view class="tipsBack" v-if="generalShow" :catchtouchmove="true"></view>
-		<view class="tipsCont" v-if="generalShow" :catchtouchmove="true">
-			<view class="tipsWhite">
-				<view class="tipsTitle">还款计划表（单位：元）</view>
-				<view class="tipsList">
-					<view class="tipsList-tab">
-						<view class="tips-tab-item">期数</view>
-						<view class="tips-tab-item">还款金额</view>
-						<view class="tips-tab-item">本金</view>
-						<view class="tips-tab-item">手续费</view>
-					</view>
-					<view class="tipsList-data">
-						<view class="tipsList-label" v-for="(items, index) in timeArr" :key="index">
-							<view class="tips-label-item">第{{index+1}}期</view>
-							<view class="tips-label-item">{{items.total}}</view>
-							<view class="tips-label-item">{{items.principal}}</view>
-							<view class="tips-label-item">{{items.tax}}</view>
-						</view>
-						<view class="tipsList-label">
-							<view class="tips-label-item">合计</view>
-							<view class="tips-label-item">{{timeAll.total}}</view>
-							<view class="tips-label-item">{{timeAll.principal}}</view>
-							<view class="tips-label-item">{{timeAll.tax}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="tipsWhite-btn">
-					<view @click="otherSee" class="tipsWhite-btn-go">
-						其他还款方式
-					</view>
-				</view>
-				<image class="close" @click="generalShow = false" src="/static/close.png" mode="widthFix"></image>
-			</view>
-		</view>
-	
-		<!-- 数据缓冲阶段 -->
-		<view class="pack-center pages-hint grey" v-if="paySuccess">
-		    <image src="/static/loadingGif.gif"></image>
-		    <view>加载中...</view>
-		</view>
+<template>
+	<view class="content">
+		<block v-if="listsArr.length > 0">
+			<image class="indexTop" src="/static/index_top.png" mode="scaleToFill"></image>
+			<view class="indexTips">
+				<view class="indexTips-name">计算历史记录</view>
+				<view class="indexTips-text">根据您填写的内容生成以下结果</view>
+				<view class="indexTips-text">详细业务请联系您的推荐人</view>
+			</view>
+			<view class="indexCont">
+				<view class="indexCont-white" v-for="(item, index) in listsArr" :key="index">
+					<view class="resultTitle">
+						{{item.institution}}
+					</view>
+					<view class="resultList">
+						<view class="item">
+							<view class="item-label">
+								<view class="item-label-name">
+									欠款金额：
+								</view>
+								<view class="item-label-text">
+									{{item.total}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									首付金额：
+								</view>
+								<view class="item-label-text" v-if="item.base">
+									{{item.base.first_amount}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									分期金额：
+								</view>
+								<view class="item-label-text" v-if="item.base">
+									{{item.base.periods_amount}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									分期期数：
+								</view>
+								<view class="item-label-text" v-if="item.base">
+									{{item.base.periods}}期
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									手续费费率：
+								</view>
+								<view class="item-label-text" v-if="item.base">
+									{{item.base.tax}}%
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									每期还款本金：
+								</view>
+								<view class="item-label-text" v-if="item.base">
+									{{item.base.every_total}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									每期还款手续费：
+								</view>
+								<view class="item-label-text" v-if="item.base">
+									{{item.base.every_tax}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									总还款金额：
+								</view>
+								<view class="item-label-text" v-if="item.base">
+									{{item.base.total}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									总还款本金：
+								</view>
+								<view class="item-label-text" v-if="item.base">
+									{{item.base.principal}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									总还款手续费：
+								</view>
+								<view class="item-label-text" v-if="item.base">
+									{{item.base.tax_amount}}元
+								</view>
+							</view>
+						</view>
+						<view class="tips">温馨提示：{{item.description}}</view>
+						<view class="see">
+							<view class="see-go" @click="generalClick(item)">点击查看还款计划表</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<view class="pack-center pages-hint" v-else>
+		    <image src="https://cdn.shuiganying.com/images/2023/04/04/40b2f4bfe2dfb828688fcd3766d6b541.png"></image>
+		    <view class="reportTips">
+		        <view class="reportTips-title">暂无数据</view>
+		        <view class="reportTips-text">抱歉，暂没有历史记录</view>
+		    </view>
+		</view>
+		
+		<!-- 还款计划表弹出 -->
+		<view class="tipsBack" v-if="generalShow" :catchtouchmove="true"></view>
+		<view class="tipsCont" v-if="generalShow" :catchtouchmove="true">
+			<view class="tipsWhite">
+				<view class="tipsTitle">还款计划表（单位：元）</view>
+				<view class="tipsList">
+					<view class="tipsList-tab">
+						<view class="tips-tab-item">期数</view>
+						<view class="tips-tab-item">还款金额</view>
+						<view class="tips-tab-item">本金</view>
+						<view class="tips-tab-item">手续费</view>
+					</view>
+					<view class="tipsList-data">
+						<view class="tipsList-label" v-for="(items, index) in timeArr" :key="index">
+							<view class="tips-label-item">第{{index+1}}期</view>
+							<view class="tips-label-item">{{items.total}}</view>
+							<view class="tips-label-item">{{items.principal}}</view>
+							<view class="tips-label-item">{{items.tax}}</view>
+						</view>
+						<view class="tipsList-label">
+							<view class="tips-label-item">合计</view>
+							<view class="tips-label-item">{{timeAll.total}}</view>
+							<view class="tips-label-item">{{timeAll.principal}}</view>
+							<view class="tips-label-item">{{timeAll.tax}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="tipsWhite-btn">
+					<view @click="otherSee" class="tipsWhite-btn-go">
+						其他还款方式
+					</view>
+				</view>
+				<image class="close" @click="generalShow = false" src="/static/close.png" mode="widthFix"></image>
+			</view>
+		</view>
+	
+		<!-- 数据缓冲阶段 -->
+		<view class="pack-center pages-hint grey" v-if="paySuccess">
+		    <image src="/static/loadingGif.gif"></image>
+		    <view>加载中...</view>
+		</view>
 	</view>
 </template>
 
-<script>
-	import { Lists } from '@/apis/interfaces/index'
-	export default {
-		data() {
-			return {
-				listsArr   : [], // 结果列表
-				timeArr    : [], // 还款计划表列表
-				timeAll    : '', // 还款计划表总计
-				otherArr   : '', // 其他携带数据
-				userId     : '',
-				generalShow: false,
-				paySuccess : true,
-			}
-		},
-		onLoad(options) {
-			this.userId = options.user_id
-		},
-		onShow() {
-			// 获取历史结果
-			this.listsInfo()
-		},
-		
-		methods: {
-			// 历史结果
-			listsInfo() {
-				Lists({
-					user_id: this.userId
-				}).then(res => {
-					this.paySuccess = false
-					this.listsArr = res
-				}).catch(err => {
-					uni.showToast({
-						title: err.message,
-						icon: "none" 
-					})
-				})
-			},
-			
-			// 查看还款计划表
-			generalClick(arr){
-				this.otherArr    = arr
-				this.timeArr     = arr.project
-				this.timeAll     = arr.project_total
-				this.generalShow = !this.generalShow
-			},
-			
-			// 其他方式
-			otherSee() {
-				let newData = JSON.stringify(this.otherArr);
-				uni.navigateTo({
-					url: `/pages/result/other?data=${encodeURIComponent(newData)}`
-				})
-				
-				this.generalShow = false
-			}
-		}
-	}
-</script>
-
-<style>
-	.indexTop {
-		width: 100%;
-		height: 440rpx;
-	}
-	
-	.indexTips {
-		position: absolute;
-		top: 0;
-		left: 0;
-		padding: 60rpx 40rpx 0;
-		box-sizing: border-box;
-		color: #fff;
-	}
-	
-	.indexTips-name {
-		font-weight: 600;
-		font-size: 44rpx;
-	}
-	
-	.indexTips-text {
-		margin-top: 20rpx;
-		font-size: 28rpx;
-	}
-	
-	.indexCont {
-		width: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		position: absolute;
-		margin-top: 200rpx;
-		top: 0;
-		left: 0;
-	}
-	
-	.indexCont-white {
-		height: 100%;
-		background: white;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-		margin-bottom: 30rpx;
-	}
-	
-	.resultTitle {
-		font-weight: 600;
-		font-size: 34rpx;
-		color: #0c58d2;
-		margin-bottom: 20rpx;
-	}
-	
-	.item-label {
-		line-height: 48rpx;
-		padding: 15rpx 0;
-		display: flex;
-		margin-right: 20rpx;
-		font-weight: 400;
-	}
-	
-	.item-label-name {
-		color: #999999;
-	}
-	
-	.textShadow {
-		filter: blur(6px);
-	}
-	
-	.tips {
-		font-weight: 400;
-		background-color: #f7faff;
-		border-radius: 10rpx;
-		padding: 20rpx 30rpx;
-		text-align: justify;
-		box-sizing: border-box;
-		font-size: 26rpx;
-		color: #999999;
-		line-height: 40rpx;
-		margin-top: 20rpx;
-	}
-	
-	.see {
-		text-align: center;
-		margin-top: 30rpx;
-	}
-	
-	.see-go {
-		display: inline-block;
-		border: 2rpx solid #0c58d2;
-		color: #0c58d2;
-		line-height: 74rpx;
-		padding: 0 25rpx;
-		border-radius: 10rpx;
-	}
-	
-	.indexLock {
-		width: 34rpx;
-		vertical-align: -4rpx;
-		margin-right: 10rpx;
-	}
-	
-	
-	/* 计划表弹出 */
-	.tipsBack {
-		position: fixed;
-		width: 100vw;
-		height: 100vh;
-		left: 0;
-		top: 0;
-		z-index: 9;
-		background-color: rgba(0, 0, 0, .6);
-	}
-	.tipsCont {
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-box-pack: center;
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		z-index: 10;
-		padding: 0 10%;
-		box-sizing: border-box;
-		text-align: center;
-	}
-	
-	.tipsWhite {
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-		position: relative;
-	}
-	
-	.close {
-		position: absolute;
-		left: calc(50% - 35rpx);
-		width: 70rpx;
-		bottom: -120rpx;
-		z-index: 999;
-	}
-	
-	.tipsTitle {
-		font-weight: 600;
-		font-size: 34rpx;
-	}
-	
-	.tipsList {
-		margin: 20rpx 0;
-		font-size: 28rpx;
-		font-weight: 400;
-	}
-	
-	.tipsList-tab {
-		display: flex;
-		background: #e5edf8;
-		line-height: 90rpx;
-		border-radius: 20rpx 20rpx 0 0;
-	}
-	
-	.tips-tab-item, .tips-label-item {
-		flex: 4;
-		text-align: center;
-	}
-	.tipsList-data {
-		background: #fafafa;
-		border-radius: 0 0 20rpx 20rpx;
-		max-height: 30vh;
-		overflow: hidden;
-		overflow-y: scroll;
-	}
-	.tipsList-label {
-		display: flex;
-		line-height: 80rpx;
-		border-bottom: 2rpx solid #eeeeee;
-	}
-	
-	.tipsList-label:last-child {
-		border: none;
-	}
-	
-	.tipsWhite-btn {
-		text-align: center;
-		padding: 30rpx 0 20rpx;
-	}
-	
-	.tipsWhite-btn-go {
-		display: inline-block;
-		width: 70%;
-		line-height: 88rpx;
-		border-radius: 80rpx;
-		background-color: #0c58d2;
-		color: #fff;
-	}
-	
-	.postertBack {
-	    width: 100vw;
-	    height: 100vh;
-	    position: fixed;
-	    background-color: rgba(0,0,0,.6);
-	    left: 0;
-	    top: 0;
-	    z-index: 999;
-	}
-	
-	.postertCont {
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-box-pack: center;
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		z-index: 1000;
-		padding: 0 10%;
-		box-sizing: border-box;
-	}
-	
-	.postertContTop {
-		top: -200rpx;
-	}
-	
-	.poster-back {
-		position: relative;
-		padding-top: 100%;
-		width: 100%;
-	}
-	
-	.poster-img, .poster-Cont {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		left: 0;
-		top: 0;
-	}
-	
-	.poster-Cont {
-		padding: 50rpx;
-		box-sizing: border-box;
-		color: #fff;
-	}
-	
-	.poster-Cont-code {
-		background: #fff;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-	}
-	
-	.poster-Cont-code image {
-		width: 100%;
-	}
-	
-	.poster-Cont-url {
-		display: flex;
-		padding: 30rpx 0 40rpx;
-	}
-	
-	.poster-url-number {
-		flex: 1;
-		padding-right: 20rpx;
-		box-sizing: border-box;
-	}
-	
-	.poster-url-copy {
-		font-weight: 600;
-	}
-	
-	.poster-Cont-btn {
-		text-align: center;
-	}
-	
-	.poster-Cont-down {
-		display: inline-block;
-		width: 80%;
-		background-color: #fff;
-		border-radius: 80rpx;
-		line-height: 90rpx;
-		color: #051437;
-		font-weight: 600;
-	}
-	
-	.poster-Cont-down-img {
-		width: 40rpx;
-		margin-left: 15rpx;
-		vertical-align: -8rpx;
-		animation: bounce-down 2s linear infinite;
-	}
-	
-	
-	@keyframes bounce-down {
-	    25% {
-	        transform: translateX(-4px);
-	    }
-	
-	    50%,
-	    100% {
-	        transform: translateX(0);
-	    }
-	
-	    75% {
-	        transform: translateX(4px);
-	    }
-	}
-	
-	.sign-img-btn {
-		position: absolute;
-		left: calc(50% - 35rpx);
-		width: 70rpx;
-		top: calc(100% + 240rpx);
-		z-index: 999;
-	}
-	
-	.poster-img-btn {
-		width: 70rpx;
-		display: block;
-		margin: 30rpx auto 0;
-	}
-	
-	/* 暂无数据 */
-	.reportTips-title {
-	    color: #000;
-	    font-size: 34rpx;
-	    line-height: 80rpx;
-	}
-	
-	.reportTips-text {
-	    font-size: 26rpx;
-	}
-	
-	.reportTips-btn {
-	    background-color: #3b7cff;
-	    display: inline-block;
-	    color: #fff;
-	    line-height: 78rpx;
-	    padding: 0 60rpx;
-	    border-radius: 10rpx;
-	    margin-top: 50rpx;
-	}
-	
-	.pack-center {
-		z-index: 99999;
-	}
-	
-	.grey {
-	    background-color: #f9f9f9;
-	    z-index: 9999999;
-	}
+<script>
+	import { Lists } from '@/apis/interfaces/index'
+	export default {
+		data() {
+			return {
+				listsArr   : [], // 结果列表
+				timeArr    : [], // 还款计划表列表
+				timeAll    : '', // 还款计划表总计
+				otherArr   : '', // 其他携带数据
+				userId     : '',
+				generalShow: false,
+				paySuccess : true,
+			}
+		},
+		onLoad(options) {
+			this.userId = options.user_id
+		},
+		onShow() {
+			// 获取历史结果
+			this.listsInfo()
+		},
+		
+		methods: {
+			// 历史结果
+			listsInfo() {
+				Lists({
+					user_id: this.userId
+				}).then(res => {
+					this.paySuccess = false
+					this.listsArr = res
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: "none" 
+					})
+				})
+			},
+			
+			// 查看还款计划表
+			generalClick(arr){
+				this.otherArr    = arr
+				this.timeArr     = arr.project
+				this.timeAll     = arr.project_total
+				this.generalShow = !this.generalShow
+			},
+			
+			// 其他方式
+			otherSee() {
+				let newData = JSON.stringify(this.otherArr);
+				uni.navigateTo({
+					url: `/pages/result/other?data=${encodeURIComponent(newData)}`
+				})
+				
+				this.generalShow = false
+			}
+		}
+	}
+</script>
+
+<style>
+	.indexTop {
+		width: 100%;
+		height: 440rpx;
+	}
+	
+	.indexTips {
+		position: absolute;
+		top: 0;
+		left: 0;
+		padding: 60rpx 40rpx 0;
+		box-sizing: border-box;
+		color: #fff;
+	}
+	
+	.indexTips-name {
+		font-weight: 600;
+		font-size: 44rpx;
+	}
+	
+	.indexTips-text {
+		margin-top: 20rpx;
+		font-size: 28rpx;
+	}
+	
+	.indexCont {
+		width: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		position: absolute;
+		margin-top: 240rpx;
+		top: 0;
+		left: 0;
+	}
+	
+	.indexCont-white {
+		height: 100%;
+		background: white;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		margin-bottom: 30rpx;
+	}
+	
+	.resultTitle {
+		font-weight: 600;
+		font-size: 34rpx;
+		color: #0c58d2;
+		margin-bottom: 20rpx;
+	}
+	
+	.item-label {
+		line-height: 48rpx;
+		padding: 15rpx 0;
+		display: flex;
+		margin-right: 20rpx;
+		font-weight: 400;
+	}
+	
+	.item-label-name {
+		color: #999999;
+	}
+	
+	.textShadow {
+		filter: blur(6px);
+	}
+	
+	.tips {
+		font-weight: 400;
+		background-color: #f7faff;
+		border-radius: 10rpx;
+		padding: 20rpx 30rpx;
+		text-align: justify;
+		box-sizing: border-box;
+		font-size: 26rpx;
+		color: #999999;
+		line-height: 40rpx;
+		margin-top: 20rpx;
+	}
+	
+	.see {
+		text-align: center;
+		margin-top: 30rpx;
+	}
+	
+	.see-go {
+		display: inline-block;
+		border: 2rpx solid #0c58d2;
+		color: #0c58d2;
+		line-height: 74rpx;
+		padding: 0 25rpx;
+		border-radius: 10rpx;
+	}
+	
+	.indexLock {
+		width: 34rpx;
+		vertical-align: -4rpx;
+		margin-right: 10rpx;
+	}
+	
+	
+	/* 计划表弹出 */
+	.tipsBack {
+		position: fixed;
+		width: 100vw;
+		height: 100vh;
+		left: 0;
+		top: 0;
+		z-index: 9;
+		background-color: rgba(0, 0, 0, .6);
+	}
+	.tipsCont {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-box-pack: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 10;
+		padding: 0 10%;
+		box-sizing: border-box;
+		text-align: center;
+	}
+	
+	.tipsWhite {
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		position: relative;
+	}
+	
+	.close {
+		position: absolute;
+		left: calc(50% - 35rpx);
+		width: 70rpx;
+		bottom: -120rpx;
+		z-index: 999;
+	}
+	
+	.tipsTitle {
+		font-weight: 600;
+		font-size: 34rpx;
+	}
+	
+	.tipsList {
+		margin: 20rpx 0;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+	
+	.tipsList-tab {
+		display: flex;
+		background: #e5edf8;
+		line-height: 90rpx;
+		border-radius: 20rpx 20rpx 0 0;
+	}
+	
+	.tips-tab-item, .tips-label-item {
+		flex: 4;
+		text-align: center;
+	}
+	.tipsList-data {
+		background: #fafafa;
+		border-radius: 0 0 20rpx 20rpx;
+		max-height: 30vh;
+		overflow: hidden;
+		overflow-y: scroll;
+	}
+	.tipsList-label {
+		display: flex;
+		line-height: 80rpx;
+		border-bottom: 2rpx solid #eeeeee;
+	}
+	
+	.tipsList-label:last-child {
+		border: none;
+	}
+	
+	.tipsWhite-btn {
+		text-align: center;
+		padding: 30rpx 0 20rpx;
+	}
+	
+	.tipsWhite-btn-go {
+		display: inline-block;
+		width: 70%;
+		line-height: 88rpx;
+		border-radius: 80rpx;
+		background-color: #0c58d2;
+		color: #fff;
+	}
+	
+	.postertBack {
+	    width: 100vw;
+	    height: 100vh;
+	    position: fixed;
+	    background-color: rgba(0,0,0,.6);
+	    left: 0;
+	    top: 0;
+	    z-index: 999;
+	}
+	
+	.postertCont {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-box-pack: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 1000;
+		padding: 0 10%;
+		box-sizing: border-box;
+	}
+	
+	.postertContTop {
+		top: -200rpx;
+	}
+	
+	.poster-back {
+		position: relative;
+		padding-top: 100%;
+		width: 100%;
+	}
+	
+	.poster-img, .poster-Cont {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+	
+	.poster-Cont {
+		padding: 50rpx;
+		box-sizing: border-box;
+		color: #fff;
+	}
+	
+	.poster-Cont-code {
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+	
+	.poster-Cont-code image {
+		width: 100%;
+	}
+	
+	.poster-Cont-url {
+		display: flex;
+		padding: 30rpx 0 40rpx;
+	}
+	
+	.poster-url-number {
+		flex: 1;
+		padding-right: 20rpx;
+		box-sizing: border-box;
+	}
+	
+	.poster-url-copy {
+		font-weight: 600;
+	}
+	
+	.poster-Cont-btn {
+		text-align: center;
+	}
+	
+	.poster-Cont-down {
+		display: inline-block;
+		width: 80%;
+		background-color: #fff;
+		border-radius: 80rpx;
+		line-height: 90rpx;
+		color: #051437;
+		font-weight: 600;
+	}
+	
+	.poster-Cont-down-img {
+		width: 40rpx;
+		margin-left: 15rpx;
+		vertical-align: -8rpx;
+		animation: bounce-down 2s linear infinite;
+	}
+	
+	
+	@keyframes bounce-down {
+	    25% {
+	        transform: translateX(-4px);
+	    }
+	
+	    50%,
+	    100% {
+	        transform: translateX(0);
+	    }
+	
+	    75% {
+	        transform: translateX(4px);
+	    }
+	}
+	
+	.sign-img-btn {
+		position: absolute;
+		left: calc(50% - 35rpx);
+		width: 70rpx;
+		top: calc(100% + 240rpx);
+		z-index: 999;
+	}
+	
+	.poster-img-btn {
+		width: 70rpx;
+		display: block;
+		margin: 30rpx auto 0;
+	}
+	
+	/* 暂无数据 */
+	.reportTips-title {
+	    color: #000;
+	    font-size: 34rpx;
+	    line-height: 80rpx;
+	}
+	
+	.reportTips-text {
+	    font-size: 26rpx;
+	}
+	
+	.reportTips-btn {
+	    background-color: #3b7cff;
+	    display: inline-block;
+	    color: #fff;
+	    line-height: 78rpx;
+	    padding: 0 60rpx;
+	    border-radius: 10rpx;
+	    margin-top: 50rpx;
+	}
+	
+	.pack-center {
+		z-index: 99999;
+	}
+	
+	.grey {
+	    background-color: #f9f9f9;
+	    z-index: 9999999;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d7dec84..04b3305 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,931 +1,993 @@
-<template>
-	<view class="content">
-		<image class="indexTop" src="/static/index_top.png" mode="scaleToFill"></image>
-		<view class="indexTips">
-			<view class="indexTips-name">欢迎使用盘债计算器</view>
-			<view class="indexTips-text">请填写以下内容 <image class="indexTips-warm" @click="warmClick" src="/static/warm.png" mode="widthFix"></image></view>
-		</view>
-		<view class="indexCont">
-			<view class="indexCont-white">
-				<view class="indexUser" v-if="userLogin">
-					<block v-if="inviteUser.user_id != ''">
-						<view class="indexUser-left">
-							<view class="indexUser-head"><image :src="inviteUser.avatar ? inviteUser.avatar : '/static/user_default.png' " mode="aspectFill"></image></view>
-							<view class="indexUser-text">
-								<view class="indexUser-name">
-									{{inviteUser.realname ? inviteUser.realname : '--'}} <text class="indexUser-number">{{inviteUser.username ? inviteUser.username : '--'}}</text>
-								</view>
-								<view class="indexUser-tips">
-									详细业务咨询请联系我
-								</view>
-							</view>
-						</view>
-						<image class="indexUser-tel" @click="callPhone" src="/static/tel.png" mode="aspectFill"></image>
-					</block>
-					<block v-else>
-						<view class="indexUser-left">
-							<view class="indexUser-head"><image :src="serviceData.avatar" mode="aspectFill"></image></view>
-							<view class="indexUser-text">
-								<view class="indexUser-name">
-									{{serviceData.realname}} <text class="indexUser-number">{{serviceData.username}}</text>
-								</view>
-								<view class="indexUser-tips">
-									详细业务咨询请联系客服
-								</view>
-							</view>
-						</view>
-						<image class="indexUser-tel" @click="callPhone" src="/static/tel.png" mode="aspectFill"></image>
-					</block>
-				</view>
-				<view class="list">
-					<block v-for="(item, index) in serviceArr" :key="index">
-						<view class="listName">
-							机构{{index + 1}}
-							<view class="list-remove" @click="onRemove(index)" v-if="index > 0">
-								<image src="/static/removeIcon.png" mode="widthFix"></image>删除
-							</view>
-						</view>
-						<view class="listItem">
-							<view class="listItem-name">
-								{{item.titleName}}
-							</view>
-							<view class="listItem-picker">
-								<block v-if="objectArray != ''">
-									<picker :disabled="!canSettle" :range="objectArray" :value="item.pickerIndex" :range-key="'title'" class="listItem-picker-add" @change="($event) => item.pickerIndex = $event.detail.value">
-										<view class="uni-input" v-if="objectArray[item.pickerIndex]">{{objectArray[item.pickerIndex].title}}</view>
-									</picker>
-								</block>
-								<view class="listItem-picker-add" v-else>请先登录</view>
-								<image src="/static/basic_down.png" class="listItem-picker-img" mode="widthFix"></image>
-							</view>
-						</view>
-						<view class="listItem">
-							<view class="listItem-name">
-								{{item.priceName}}
-							</view>
-							<view class="listItem-picker">
-								<input v-if="userLogin" type="number" :disabled="!canSettle" :value="item.priceValue" placeholder="请输入欠款金额" placeholder-class="placeholderClass" @input="($event) => item.priceValue = $event.detail.value" />
-								<view class="listItem-picker-add" v-else>请先登录</view>
-							</view>
-						</view>
-					</block>
-				</view>
-				<view class="listAdd">
-					<view class="listAdd-btn" @click="addPush">
-						<image src="/static/add.png" mode="widthFix"></image>添加新机构
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<view class="listSubmit">
-			<view class="listSubmit-btn" :class="{active: !canSettle}" @click="onSubmit" v-if="userLogin">
-				{{canRemark}}<block v-if="canSettle"><block v-if="numberCount.have_count > 0 && numberCount.have_count <= 5">(剩余次数{{numberCount.have_count}})</block></block>
-			</view>
-			<view class="listSubmit-btn" @click="onLogin" v-else>
-				请先登录
-			</view>
-		</view>
-		
-		<!-- 漂浮窗 -->
-		<view class="showy" v-if="userLogin">
-			<navigator hover-class="none" url="/pages/index/custom" class="showy-item" v-if="isSalesman">
-				<image class="showy-item-img" src="/static/record.png" mode="widthFix"></image>
-				<view class="showy-item-name"><text>客户</text><text>管理</text></view>
-			</navigator>
-			<view class="showy-item" @click="isImgLay = true">
-				<image class="showy-item-img" src="/static/share.png" mode="widthFix"></image>
-				<view class="showy-item-name">分享</view>
-				<view class="showy-item-number" v-if="numberCount.share_balance > 0">+{{numberCount.share_add}}次</view>
-			</view>
-			<view class="showy-item">
-				<image class="showy-item-img" src="/static/record.png" mode="widthFix"></image>
-				<view class="showy-item-name" @click="historyClick"><text>历史</text><text>记录</text></view>
-				<view class="showy-item-number" v-if="numberCount.use_count > 0">{{numberCount.use_count}}条</view>
-			</view>
-		</view>
-		
-		<!-- 邀请好友弹出 -->
-		<view class="postertBack" v-if="isImgLay"></view>
-		<view class="postertCont postertContTop" v-if="isImgLay">
-			<view class="poster-back">
-				<image class="poster-img" src="/static/share_back.png" mode="widthFix"></image>
-				<view class="poster-Cont">
-				    <view class="poster-Cont-code">
-						<image :src="canShare.qrcode" mode="widthFix"></image>
-					</view>
-				    <view class="poster-Cont-url">
-						<view class="nowrap poster-url-number" @click="copyUrl(canShare.url)">地址：{{canShare.url}}/</view>
-						<view class="poster-url-copy">复制</view>
-				    </view>
-					<view class="poster-Cont-btn">
-						<view class="poster-Cont-down" @click="shareClick">保存图片，分享好友<image class="poster-Cont-down-img" src="/static/hand.png" mode="widthFix"></image></view>
-					</view>
-				</view>
-				<image class="sign-img-btn" src="/static/close.png" @click="isImgLay = false" mode="widthFix"></image>
-			</view>
-		</view>
-		
-		<!-- 长按保存 -->
-		<view class="postertBack" v-if="isImgLong"></view>
-		<view class="postertCont" v-if="isImgLong">
-			<view class="poster-back">
-				<image v-if="isImgLong" class="poster-img" :src="posterImg" mode="widthFix"></image>
-				<view class="poster-Cont-btn" style="margin-top: 40rpx; text-align: center;">
-					<view class="poster-Cont-down">请长按图片，保存本地</view>
-					<image class="poster-img-btn" src="/static/close.png" @click="isImgLong = false" mode="widthFix"></image>
-				</view>
-			</view>
-		</view>
-		
-		<!-- 海报canvas -->
-		<vue-canvas-poster :widthPixels="1000" :painting="paintings" @success="saveSuccess" @fail="saveFail"></vue-canvas-poster>
-		
-		<!-- 提交缓冲阶段 -->
-		<view class="pack-center pages-hint grey" v-if="paySuccess">
-		    <image src="/static/loadingGif.gif"></image>
-		    <view>计算结果中...</view>
-		</view>
-		
-		<!-- 是否确定提交计算 -->
-		<view class="tipsBack" v-if="generalShow"></view>
-		<view class="tipsCont" v-if="generalShow">
-			<view class="tipsWhite">
-				<image class="tipsCont-img" src="/static/tips.png" mode="widthFix"></image>
-				<view class="tipsWhite-top">
-					<view class="tipsWhite-name">
-						计算提示
-					</view>
-					<view class="tipsWhite-text">
-						请确认提交的数据是否准确？确定后进行提交
-					</view>
-				</view>
-				<view class="tipsWhite-btn">
-					<view class="tipsWhite-btn-go" @click="generalShow = false">
-						暂不提交
-					</view>
-					<view class="tipsWhite-btn-go" @click="judgeGeneral">
-						立即提交
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { VueCanvasPoster } from 'vue-canvas-poster'
-	import { authFollow, wechatCode } from '@/apis/interfaces/authUrl'
-	import { Init, Debt } from '@/apis/interfaces/index'
-	import h5Copy from '@/js_sdk/junyi-h5-copy/junyi-h5-copy/junyi-h5-copy.js'
-	export default {
-		components: {
-		    VueCanvasPoster
-		},
-		data() {
-			return {
-				userLogin  : false, // 是否登录
-				canRemark  : '', // 按钮文字
-				canSettle  : false, // 是否计算
-				canShare   : '',  // 分享数据
-				serviceData: '',  // 客服信息
-				inviteUser : '',  // 用户信息
-				serviceArr : [],
-				blurValue  : '',
-				numberCount: '',    // 计算次数
-				haveCount  : '',    // 用户计算
-				objectArray: [],    // 机构列表
-				isSalesman : '',    // 客户管理
-				paySuccess : false, // 计算结果
-				generalShow: false,  // 是否提交
-				
-				// 海报
-				isImgLay   : false, // 是否显示图片弹出层
-				isImgLong  : false,// 长按保存图片
-				paintings  : {
-				    width: "375px",
-				    height: "375px",
-				    borderRadius: "10px",
-				    background: "#ffffff",
-				    views: [
-				        //海报背景
-				        {
-				            type: "image",
-				            url: "/static/share_downback.png",
-				            css: {
-				                top: "0",
-				                left: "0",
-				                width: "375px",
-				                height: "375px",
-				                mode: 'aspectFill'
-				            },
-				        },
-				        
-				        //二维码
-				        {
-				            type: "image",
-				            url: "",
-				            css: {
-				                top: "60px",
-				                left: "60px",
-				                width: "255px",
-				                height: "255px",
-				                mode: 'aspectFill'
-				            },
-				        }
-				    ],
-				},
-				posterImg	: "", //生成的海报图片路径
-			}
-		},
-		
-		onLoad(options) {
-			// 邀请码数据
-			if(options != '') {
-				this.$store.commit('setInvite', options.invite)
-				this.$store.commit('setShareUser', options.share_user)
-				this.$store.commit('setLockId', options.lock_id)
-			}
-		},
-		
-		onShow() {
-		    if(this.$store.getters.getToken) {
-		        this.userLogin = true
-				
-				// 获取计算前置接口
-				this.preUrl()
-				return
-		    }
-			this.userLogin = false
-		},
-		
-		created() {
-			// 新增卡片
-			this.serviceArr.push({
-				titleName  : '机构名称',
-				priceName  : '欠款金额',
-				pickerIndex: 0,
-				priceValue : '',
-			})
-		},
-		
-		methods: {
-			// 计算前置接口
-			preUrl() {
-				Init().then(res => {
-					this.serviceData = res.service
-					this.isSalesman  = res.is_salesman
-					this.inviteUser  = res.invite_user
-					this.canShare    = res.share
-					this.canSettle   = res.can_settle
-					this.canRemark   = res.can_remark
-					this.numberCount = res.count
-					this.haveCount  = res.count.have_count - 1
-					this.objectArray = res.institution
-					this.paintings.views[1].url  = res.share.qrcode
-				}).catch(err => {
-					this.userLogin = false
-					uni.showToast({
-						title: err.message,
-						icon: "none" 
-					})
-				})
-			},
-			
-			// 新增表单数据
-			addPush(){
-				if(this.$store.getters.getToken) {
-					// 是否可以计算
-				    if(this.canSettle) {
-						if(this.haveCount != 0) {
-							this.serviceArr.push({
-								titleName  : '机构名称',
-								priceName  : '欠款金额',
-								pickerIndex: 0,
-								priceValue : '',
-							})
-							this.haveCount --
-						} else {
-							uni.showToast({
-								title: '抱歉，没有次数啦',
-								icon: "none" 
-							})
-						}
-				    	return
-				    }
-				    
-				    uni.showToast({
-				    	title: this.canRemark,
-				    	icon: "none" 
-				    })
-					return
-				}
-				uni.showToast({
-					title: '请先登录',
-					icon: "none" 
-				})
-			},
-			
-			// 移出选项
-			onRemove(index){
-				this.serviceArr.splice(index, 1)
-				this.haveCount ++
-			},
-			
-			// 提交订单数据-确认
-			onSubmit(){
-				// 已完善信息
-				if(this.$store.getters.getPassInfo != 'false') {
-					if(this.canSettle) {
-						this.generalShow = true
-						return
-					}
-					uni.showToast({
-						title: this.canRemark,
-						icon: "none" 
-					})
-					return
-				}
-				
-				// 完善个人信息
-				uni.navigateTo({
-				    url: '/pages/index/perfect'
-				})
-				
-			},
-			
-			// 提交订单数据
-			judgeGeneral() {
-				this.generalShow = false
-				
-				let SubmitAdd = this.serviceArr.map(obj => {
-					return {
-						institution_id	: this.objectArray[obj.pickerIndex].id,
-						total			: obj.priceValue,
-					}
-				})
-				Debt({
-					invite	 : this.$store.getters.getInvite,
-					lock_id	 : this.$store.getters.getLockId,
-					data     : SubmitAdd
-				}).then(res => {
-					this.paySuccess = true
-					
-					this.serviceArr.splice(0,this.serviceArr.length);//清空数组
-					this.serviceArr.push({
-						titleName  : '机构名称',
-						priceName  : '欠款金额',
-						pickerIndex: 0,
-						priceValue : '',
-					})
-					
-					
-					// 跳转结果页面
-					setTimeout(()=>{
-						this.paySuccess = false
-						uni.navigateTo({
-							url: '/pages/result/result'
-						})
-					},3000)
-					
-				}).catch(err => {
-					uni.showToast({
-						title: err.message,
-						icon: "none" 
-					})
-				})
-			},
-			
-			// 微信授权登录
-			onLogin() {
-				authFollow({
-					url: 'http://debtwww.douhuofalv.com/pages/webview/webview',
-					scopes: ''
-				}).then(res => {
-					window.location.href = res
-				}).catch(err => {
-					uni.showToast({
-						title: err.message,
-						icon: "none" 
-					})
-				})
-			},
-			
-			// 查看历史记录
-			historyClick() {
-				uni.navigateTo({
-				    url: '/pages/result/history'
-				})
-			},
-			
-			// 拨打电话
-			callPhone(e) {
-				uni.makePhoneCall({
-					phoneNumber: this.inviteUser.username
-				})
-			},
-			
-			// 查看温馨提示
-			warmClick() {
-				uni.showModal({
-					title: '温馨提示',
-					content: '新用户可免费计算2个机构，每邀请1名用户完成计算可增加1个机构计算份额。用户计算机构份额上限为5个。',
-					showCancel: false,
-					success: res=> {
-						if (res.confirm) {
-							console.log('用户点击确定');
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			
-			// 复制订单号
-			copyUrl(val) {
-			    const result = h5Copy(val)
-				if (result === false) {
-					uni.showToast({
-						title:'不支持',
-					})
-					return
-				}
-				uni.showToast({
-				   title:'复制成功',
-				   icon:'none'
-				})
-			},
-			
-			// 下载海报
-			shareClick (){
-				this.isImgLay = false
-				this.isImgLong = true
-				
-			},
-			saveSuccess(src) {
-			    this.posterImg = src;
-			},
-			saveFail(err) {},
-		}
-	}
-</script>
-
-<style>
-	.indexTop {
-		width: 100%;
-		height: 440rpx;
-	}
-	
-	.indexTips {
-		position: absolute;
-		top: 0;
-		left: 0;
-		padding: 60rpx 40rpx 0;
-		box-sizing: border-box;
-		color: #fff;
-	}
-	
-	.indexTips-name {
-		font-weight: 600;
-		font-size: 44rpx;
-	}
-	
-	.indexTips-text {
-		margin-top: 20rpx;
-		font-size: 28rpx;
-		display: flex;
-	}
-	
-	.indexTips-warm {
-		width: 34rpx;
-		margin-left: 15rpx;
-		margin-top: 2rpx;
-		
-	}
-	.indexCont {
-		width: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		position: absolute;
-		margin-top: 200rpx;
-		top: 0;
-		left: 0;
-		border-bottom: 140rpx solid transparent;
-	}
-	
-	.indexCont-white {
-		height: 100%;
-		background: white;
-		border-radius: 20rpx;
-	}
-	
-	.indexUser {
-		display: flex;
-		border-bottom: 4rpx solid #f7faff;
-		padding: 40rpx 30rpx;
-		box-sizing: border-box;
-	}
-	
-	.indexUser-left {
-		display: flex;
-		flex: 1;
-	}
-	
-	.indexUser-head {
-		width: 110rpx;
-		height: 110rpx;
-		border-radius: 100%;
-		background-color: #e5ecf6;
-		border: 6rpx solid #e5ecf6;
-		box-sizing: border-box;
-	}
-	
-	.indexUser-head image {
-		border-radius: 100%;
-		width: 100%;
-		height: 100%;
-	}
-	
-	.indexUser-text {
-		width: calc(100% - 150rpx);
-		padding: 0 20rpx;
-		box-sizing: border-box;
-	}
-	
-	.indexUser-name {
-		font-weight: 600;
-		display: flex;
-		font-size: 34rpx;
-		line-height: 58rpx;
-	}
-	
-	.indexUser-tips {
-		font-size: 28rpx;
-	}
-	
-	.indexUser-number {
-		font-size: 30rpx;
-		font-weight: normal;
-		padding-left: 20rpx;
-		box-sizing: border-box;
-		line-height: 62rpx;
-		color: #666666;
-		display: inline-block;
-	}
-	
-	.indexUser-tel {
-		width: 60rpx;
-		height: 60rpx;
-		margin-top: 30rpx;
-	}
-	
-	.list {
-		padding: 20rpx 30rpx;
-		box-sizing: border-box;
-	}
-	
-	.listName {
-		color: #0c58d2;
-		font-weight: 600;
-		font-size: 34rpx;
-		margin: 30rpx 0 ;
-		position: relative;
-	}
-	
-	
-	.list-remove {
-		background-color: #FBE7EE;
-		display: inline-block;
-		position: absolute;
-		padding: 0 20rpx;
-		font-size: 26rpx;
-		font-weight: normal;
-		line-height: 44rpx;
-		color: #d4155a;
-		border-radius: 50rpx;
-		top: 0;
-		right: 0;
-	}
-	
-	.list-remove image {
-		width: 24rpx;
-		height: 24rpx;
-		margin-right: 10rpx;
-		vertical-align: -2rpx;
-	}
-	
-	.listItem-name {
-		margin: 30rpx 0;
-	}
-	
-	.listItem-picker {
-		background-color: #f7faff;
-		border-radius: 15rpx;
-		height: 90rpx;
-		line-height: 90rpx;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		position: relative;
-	}
-	
-	.listItem-picker input {
-		display: block;
-		height: 100%;
-		background-color: transparent;
-	}
-	
-	.listItem-picker-img {
-		width: 30rpx;
-		position: absolute;
-		right: 30rpx;
-		top: 30rpx;
-	}
-	
-	.listAdd {
-		text-align: center;
-		color: #0c58d2;
-		padding: 40rpx 0 40rpx;
-	}
-	
-	.listAdd-btn image {
-		width: 30rpx;
-		vertical-align: middle;
-		margin-right: 10rpx;
-	}
-	
-	.listSubmit {
-		position: fixed;
-		width: 100%;
-		bottom: 0;
-		left: 0;
-		background-color: #f7faff;
-		text-align: center;
-		height: 120rpx;
-	}
-	
-	.listSubmit-btn {
-		width: 90%;
-		display: inline-block;
-		background-color: #0352c8;
-		text-align: center;
-		line-height: 90rpx;
-		border-radius: 100rpx;
-		color: #fff;
-	}
-	
-	.listSubmit-btn.active {
-		background-color: #dcdcdc;
-		color: #666;
-	}
-	
-	/* 漂浮窗 */
-	.showy {
-		position: fixed;
-		right: 0;
-		bottom: 15%;
-		background-color: #fff;
-		box-shadow: 0 0 20rpx rgba(3, 96, 217, .1);
-		z-index: 999;
-		border-radius: 60rpx 0 0 60rpx;
-		padding: 30rpx 0;
-	}
-	
-	.showy-item {
-		text-align: center;
-		padding: 20rpx 30rpx 10rpx 35rpx;
-		font-size: 26rpx;
-		position: relative;
-	}
-	
-	.showy-item-number {
-		position: absolute;
-		right: 5rpx;
-		top: 0;
-		background-color: #ff7171;
-		color: #fff;
-		font-size: 22rpx;
-		border-radius: 80rpx;
-		padding: 0 10rpx;
-		transform: scale(0.83);
-		line-height: 40rpx;
-	}
-	
-	.showy-item-img {
-		width: 44rpx;
-	}
-	
-	.showy-item-name text {
-		display: block;
-	}
-	
-	.postertBack {
-	    width: 100vw;
-	    height: 100vh;
-	    position: fixed;
-	    background-color: rgba(0,0,0,.6);
-	    left: 0;
-	    top: 0;
-	    z-index: 999;
-	}
-	
-	.postertCont {
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-box-pack: center;
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		z-index: 1000;
-		padding: 0 10%;
-		box-sizing: border-box;
-	}
-	
-	.postertContTop {
-		top: -200rpx;
-	}
-	
-	.poster-back {
-		position: relative;
-		padding-top: 100%;
-		width: 100%;
-	}
-	
-	.poster-img, .poster-Cont {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		left: 0;
-		top: 0;
-	}
-	
-	.poster-Cont {
-		padding: 50rpx;
-		box-sizing: border-box;
-		color: #fff;
-	}
-	
-	.poster-Cont-code {
-		background: #fff;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-	}
-	
-	.poster-Cont-code image {
-		width: 100%;
-	}
-	
-	.poster-Cont-url {
-		display: flex;
-		padding: 30rpx 0 40rpx;
-	}
-	
-	.poster-url-number {
-		flex: 1;
-		padding-right: 20rpx;
-		box-sizing: border-box;
-	}
-	
-	.poster-url-copy {
-		font-weight: 600;
-	}
-	
-	.poster-Cont-btn {
-		text-align: center;
-	}
-	
-	.poster-Cont-down {
-		display: inline-block;
-		width: 80%;
-		background-color: #fff;
-		border-radius: 80rpx;
-		line-height: 90rpx;
-		color: #051437;
-		font-weight: 600;
-	}
-	
-	.poster-Cont-down-img {
-		width: 40rpx;
-		margin-left: 15rpx;
-		vertical-align: -8rpx;
-		animation: bounce-down 2s linear infinite;
-	}
-	
-	
-	@keyframes bounce-down {
-	    25% {
-	        transform: translateX(-4px);
-	    }
-	
-	    50%,
-	    100% {
-	        transform: translateX(0);
-	    }
-	
-	    75% {
-	        transform: translateX(4px);
-	    }
-	}
-	
-	.sign-img-btn {
-		position: absolute;
-		left: calc(50% - 35rpx);
-		width: 70rpx;
-		top: calc(100% + 240rpx);
-		z-index: 999;
-	}
-	
-	.poster-img-btn {
-		width: 70rpx;
-		display: block;
-		margin: 30rpx auto 0;
-	}
-	
-	
-	.grey {
-	    background-color: #f9f9f9;
-	    z-index: 999999;
-	}
-	
-	/* 是否确认提交 */
-	.tipsBack {
-		position: fixed;
-		width: 100vw;
-		height: 100vh;
-		left: 0;
-		top: 0;
-		z-index: 9999;
-		background-color: rgba(0, 0, 0, .8);
-	}
-	.tipsCont {
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-box-pack: center;
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		z-index: 10000;
-		padding: 0 10%;
-		box-sizing: border-box;
-	}
-	
-	.tipsWhite {
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		overflow: hidden;
-	}
-	
-	.tipsWhite-top {
-		padding: $padding;
-		box-sizing: border-box;
-		text-align: center;
-	}
-	
-	.tipsCont-img {
-		width: 100%;
-	}
-	
-	.tipsWhite-name {
-		text-align: center;
-		color: #111111;
-		font-size: 34rpx;
-		font-weight: 600;
-		margin-bottom: 15rpx;
-	}
-	
-	.tipsWhite-text {
-		font-size: 30rpx;
-		color: #666666;
-		line-height: 48rpx;
-		padding: 0 50rpx;
-		box-sizing: border-box;
-	}
-	
-	.tipsWhite-btn {
-		display: flex;
-		padding: 30rpx 10rpx;
-		box-sizing: border-box;
-	}
-	
-	.tipsWhite-btn-go {
-		flex: 2;
-		color: #fff;
-		margin: 0 15rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		text-align: center;
-		border: 2rpx solid #F6F6F6;
-		background-color: #007df5;
-		border-radius: 20rpx;
-	}
-	
-	.tipsWhite-btn-go:first-child {
-		color: #333333;
-		background-color: #ffffff;
-		border: 2rpx solid #cccccc;
-	}
+<template>
+	<view class="content">
+		<image class="indexTop" src="/static/index_top.png" mode="scaleToFill"></image>
+		<view class="indexTips">
+			<view class="indexTips-name">欢迎使用盘债计算器</view>
+			<view class="indexTips-text">请填写以下内容 <image class="indexTips-warm" @click="warmClick" src="/static/warm.png" mode="widthFix"></image></view>
+		</view>
+		<view class="indexCont">
+			<view class="indexCont-white">
+				<view class="indexUser" v-if="userLogin">
+					<block v-if="inviteUser.user_id != ''">
+						<view class="indexUser-left">
+							<view class="indexUser-head"><image :src="inviteUser.avatar ? inviteUser.avatar : '/static/user_default.png' " mode="aspectFill"></image></view>
+							<view class="indexUser-text">
+								<view class="indexUser-name">
+									{{inviteUser.realname ? inviteUser.realname : '--'}} <text class="indexUser-number">{{inviteUser.username ? inviteUser.username : '--'}}</text>
+								</view>
+								<view class="indexUser-tips">
+									详细业务请联系您的推荐人
+								</view>
+							</view>
+						</view>
+						<image class="indexUser-tel" @click="callPhone" src="/static/tel.png" mode="aspectFill"></image>
+					</block>
+					<block v-else>
+						<view class="indexUser-left">
+							<view class="indexUser-head"><image :src="serviceData.avatar" mode="aspectFill"></image></view>
+							<view class="indexUser-text">
+								<view class="indexUser-name">
+									{{serviceData.realname}} <text class="indexUser-number">{{serviceData.username}}</text>
+								</view>
+								<view class="indexUser-tips">
+									详细业务咨询请联系客服
+								</view>
+							</view>
+						</view>
+						<image class="indexUser-tel" @click="callPhone" src="/static/tel.png" mode="aspectFill"></image>
+					</block>
+				</view>
+				<view class="list">
+					<block v-for="(item, index) in serviceArr" :key="index">
+						<view class="listName">
+							机构{{index + 1}}
+							<view class="list-remove" @click="onRemove(index)" v-if="index > 0">
+								<image src="/static/removeIcon.png" mode="widthFix"></image>删除
+							</view>
+						</view>
+						<view class="listItem">
+							<view class="listItem-name">
+								{{item.titleName}}
+							</view>
+							<view class="listItem-picker">
+								<block v-if="objectArray != ''">
+									<!-- 新筛选 带搜索 -->
+									<view class="idcardAdd-picker" style="width: 100%;" @click="onShowInstitution(objectArray, item, index)">
+										<view class="institution-picker-text nowrap">{{objectArray[item.pickerIndex].title}}</view>
+									</view>
+									
+									<!-- <picker :disabled="!canSettle" :range="objectArray" :value="item.pickerIndex" :range-key="'title'" class="listItem-picker-add" @change="($event) => item.pickerIndex = $event.detail.value">
+										<view class="uni-input" v-if="objectArray[item.pickerIndex]">{{objectArray[item.pickerIndex].title}}</view>
+									</picker> -->
+								</block>
+								<view class="listItem-picker-add" v-else>请先登录</view>
+								<image src="/static/basic_down.png" class="listItem-picker-img" mode="widthFix"></image>
+							</view>
+						</view>
+						<view class="listItem">
+							<view class="listItem-name">
+								{{item.priceName}}
+							</view>
+							<view class="listItem-picker">
+								<input v-if="userLogin" type="number" :disabled="!canSettle" :value="item.priceValue" placeholder="请输入欠款金额" placeholder-class="placeholderClass" @input="($event) => item.priceValue = $event.detail.value" />
+								<view class="listItem-picker-add" v-else>请先登录</view>
+							</view>
+						</view>
+					</block>
+				</view>
+				<!-- <view class="listAdd">
+					<view class="listAdd-btn" @click="addPush">
+						<image src="/static/add.png" mode="widthFix"></image>添加新机构
+					</view>
+				</view> -->
+			</view>
+		</view>
+		
+		<view class="listSubmit">
+			<view class="listSubmit-btn" :class="{active: !canSettle}" @click="onSubmit" v-if="userLogin">
+				{{canRemark}}<block v-if="canSettle"><block v-if="numberCount.have_count > 0 && numberCount.have_count <= 5">(剩余次数{{numberCount.have_count}})</block></block>
+			</view>
+			<view class="listSubmit-btn" @click="onLogin" v-else>
+				请先登录
+			</view>
+		</view>
+		
+		<!-- 漂浮窗 -->
+		<view class="showy" v-if="userLogin">
+			<navigator hover-class="none" url="/pages/index/custom" class="showy-item" v-if="isSalesman">
+				<image class="showy-item-img" src="/static/record.png" mode="widthFix"></image>
+				<view class="showy-item-name"><text>客户</text><text>管理</text></view>
+			</navigator>
+			<view class="showy-item" @click="isImgLay = true">
+				<image class="showy-item-img" src="/static/share.png" mode="widthFix"></image>
+				<view class="showy-item-name">分享</view>
+				<view class="showy-item-number" v-if="numberCount.share_balance > 0">+{{numberCount.share_add}}次</view>
+			</view>
+			<view class="showy-item">
+				<image class="showy-item-img" src="/static/record.png" mode="widthFix"></image>
+				<view class="showy-item-name" @click="historyClick"><text>历史</text><text>记录</text></view>
+				<view class="showy-item-number" v-if="numberCount.use_count > 0">{{numberCount.use_count}}条</view>
+			</view>
+		</view>
+		
+		<!-- 邀请好友弹出 -->
+		<view class="postertBack" v-if="isImgLay"></view>
+		<view class="postertCont postertContTop" v-if="isImgLay">
+			<view class="poster-back">
+				<image class="poster-img" src="/static/share_back.png" mode="widthFix"></image>
+				<view class="poster-Cont">
+				    <view class="poster-Cont-code">
+						<image :src="canShare.qrcode" mode="widthFix"></image>
+					</view>
+				    <view class="poster-Cont-url">
+						<view class="nowrap poster-url-number" @click="copyUrl(canShare.url)">地址：{{canShare.url}}/</view>
+						<view class="poster-url-copy">复制</view>
+				    </view>
+					<view class="poster-Cont-btn">
+						<view class="poster-Cont-down" @click="shareClick">保存图片，分享好友<image class="poster-Cont-down-img" src="/static/hand.png" mode="widthFix"></image></view>
+					</view>
+				</view>
+				<image class="sign-img-btn" src="/static/close.png" @click="isImgLay = false" mode="widthFix"></image>
+			</view>
+		</view>
+		
+		<!-- 长按保存 -->
+		<view class="postertBack" v-if="isImgLong"></view>
+		<view class="postertCont" v-if="isImgLong">
+			<view class="poster-back">
+				<image v-if="isImgLong" class="poster-img" :src="posterImg" mode="widthFix"></image>
+				<view class="poster-Cont-btn" style="margin-top: 40rpx; text-align: center;">
+					<view class="poster-Cont-down">请长按图片，保存本地</view>
+					<image class="poster-img-btn" src="/static/close.png" @click="isImgLong = false" mode="widthFix"></image>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 海报canvas -->
+		<vue-canvas-poster :widthPixels="1000" :painting="paintings" @success="saveSuccess" @fail="saveFail"></vue-canvas-poster>
+		
+		<!-- 提交缓冲阶段 -->
+		<view class="pack-center pages-hint grey" v-if="paySuccess">
+		    <image src="/static/loadingGif.gif"></image>
+		    <view>计算结果中...</view>
+		</view>
+		
+		<!-- 是否确定提交计算 -->
+		<view class="tipsBack" v-if="generalShow"></view>
+		<view class="tipsCont" v-if="generalShow">
+			<view class="tipsWhite">
+				<image class="tipsCont-img" src="/static/tips.png" mode="widthFix"></image>
+				<view class="tipsWhite-top">
+					<view class="tipsWhite-name">
+						计算提示
+					</view>
+					<view class="tipsWhite-text">
+						请确认提交的数据是否准确？确定后进行提交
+					</view>
+				</view>
+				<view class="tipsWhite-btn">
+					<view class="tipsWhite-btn-go" @click="generalShow = false">
+						暂不提交
+					</view>
+					<view class="tipsWhite-btn-go" @click="judgeGeneral">
+						立即提交
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 机构筛选弹出层 -->
+		<oct-mechanism-picker
+			ref="institutionPicker"
+			title="请选择机构"
+			:columns="columns"
+			@choose="institutionChange"
+		/>
+		
+	</view>
+</template>
+
+<script>
+	import { VueCanvasPoster } from 'vue-canvas-poster'
+	import { authFollow, wechatCode } from '@/apis/interfaces/authUrl'
+	import { Init, Debt } from '@/apis/interfaces/index'
+	// import { userTest } from '@/apis/interfaces/index'
+	import h5Copy from '@/js_sdk/junyi-h5-copy/junyi-h5-copy/junyi-h5-copy.js'
+	export default {
+		components: {
+		    VueCanvasPoster
+		},
+		data() {
+			return {
+				userLogin  : false, // 是否登录
+				canRemark  : '', // 按钮文字
+				canSettle  : false, // 是否计算
+				canShare   : '',  // 分享数据
+				serviceData: '',  // 客服信息
+				inviteUser : '',  // 用户信息
+				serviceArr : [],
+				blurValue  : '',
+				numberCount: '',    // 计算次数
+				haveCount  : '',    // 用户计算
+				objectArray: [],    // 机构列表
+				isSalesman : '',    // 客户管理
+				paySuccess : false, // 计算结果
+				generalShow: false,  // 是否提交
+				
+				// 海报
+				isImgLay   : false, // 是否显示图片弹出层
+				isImgLong  : false,// 长按保存图片
+				paintings  : {
+				    width: "375px",
+				    height: "375px",
+				    borderRadius: "10px",
+				    background: "#ffffff",
+				    views: [
+				        //海报背景
+				        {
+				            type: "image",
+				            url: "/static/share_downback.png",
+				            css: {
+				                top: "0",
+				                left: "0",
+				                width: "375px",
+				                height: "375px",
+				                mode: 'aspectFill'
+				            },
+				        },
+				        
+				        //二维码
+				        {
+				            type: "image",
+				            url: "",
+				            css: {
+				                top: "50px",
+				                left: "60px",
+				                width: "255px",
+				                height: "255px",
+				                mode: 'aspectFill'
+				            },
+				        },
+						
+						// 文本一
+						{
+						    type: "text",
+						    text: '盘债计算器',
+						    css: {
+						        top: "300px",
+						        left: "134px",
+								width: "375px",
+						        fontSize: "20px",
+						        color: "#000000"
+						    },
+						},
+				    ],
+				},
+				posterImg	: "", //生成的海报图片路径
+				
+				// 新增部分-机构筛选
+				columns	   : [],
+				cIndex	   : 0
+			}
+		},
+		
+		onLoad(options) {
+			// 测试获取第一个用户的token
+			// userTest().then(res => {
+			// 	this.$store.commit('setToken', res.token_type + ' ' + res.token)
+			// }).catch(err => {
+			// 	uni.showToast({
+			// 		title: err.message,
+			// 		icon: "none" 
+			// 	})
+			// })
+			
+			// 邀请码数据
+			if(Object.keys(options).length > 0) {
+				this.$store.commit('setInvite', options.invite)
+				this.$store.commit('setShareUser', options.share_user)
+				this.$store.commit('setLockId', options.lock_id)
+			}
+		},
+		
+		onShow() {
+		    if(this.$store.getters.getToken) {
+		        this.userLogin = true
+				
+				// 获取计算前置接口
+				this.preUrl()
+				return
+		    }
+			this.userLogin = false
+		},
+		
+		created() {
+			// 新增卡片
+			this.serviceArr.push({
+				titleName  : '机构名称',
+				priceName  : '欠款金额',
+				pickerIndex: 0,
+				priceValue : '',
+			})
+			
+		},
+		
+		methods: {
+			// 计算前置接口
+			preUrl() {
+				Init().then(res => {
+					this.serviceData = res.service
+					this.isSalesman  = res.is_salesman
+					this.inviteUser  = res.invite_user
+					this.canShare    = res.share
+					this.canSettle   = res.can_settle
+					this.canRemark   = res.can_remark
+					this.numberCount = res.count
+					this.haveCount  = res.count.have_count - 1
+					this.objectArray = res.institution
+					this.paintings.views[1].url  = res.share.qrcode
+				}).catch(err => {
+					this.userLogin = false
+					uni.showToast({
+						title: err.message,
+						icon: "none" 
+					})
+				})
+			},
+			
+			// 新增表单数据
+			addPush(){
+				if(this.$store.getters.getToken) {
+					// 是否可以计算
+				    if(this.canSettle) {
+						if(this.haveCount != 0) {
+							this.serviceArr.push({
+								titleName  : '机构名称',
+								priceName  : '欠款金额',
+								pickerIndex: 0,
+								priceValue : '',
+							})
+							this.haveCount --
+						} else {
+							uni.showToast({
+								title: '抱歉，没有次数啦',
+								icon: "none" 
+							})
+						}
+				    	return
+				    }
+				    
+				    uni.showToast({
+				    	title: this.canRemark,
+				    	icon: "none" 
+				    })
+					return
+				}
+				uni.showToast({
+					title: '请先登录',
+					icon: "none" 
+				})
+			},
+			
+			// 移出选项
+			onRemove(index){
+				this.serviceArr.splice(index, 1)
+				this.haveCount ++
+			},
+			
+			// 提交订单数据-确认
+			onSubmit(){
+				// 已完善信息
+				if(this.$store.getters.getPassInfo != 'false') {
+					if(this.canSettle) {
+						this.generalShow = true
+						return
+					}
+					uni.showToast({
+						title: this.canRemark,
+						icon: "none" 
+					})
+					return
+				}
+				
+				// 完善个人信息
+				uni.navigateTo({
+				    url: '/pages/index/perfect'
+				})
+				
+			},
+			
+			// 显示选择机构 -- 带搜索
+			onShowInstitution(e, item, index){
+				this.columns = e
+				this.old	 = item
+				this.cIndex	 = index
+				this.$refs.institutionPicker.open()
+			},
+			
+			// 机构变更更新业务
+			institutionChange(e){
+				// this.serviceArr.map(val => {
+				// 	this.serviceArr[this.cIndex].pickerIndex = e.index
+				// })
+				let value = this.columns.findIndex(val => val.id === e.val.id);
+				this.serviceArr[this.cIndex].pickerIndex = value
+			},
+			
+			
+			// 提交订单数据
+			judgeGeneral() {
+				this.generalShow = false
+				
+				let SubmitAdd = this.serviceArr.map(obj => {
+					return {
+						institution_id	: this.objectArray[obj.pickerIndex].id,
+						total			: obj.priceValue,
+					}
+				})
+				
+				Debt({
+					invite	 : this.$store.getters.getInvite,
+					lock_id	 : this.$store.getters.getLockId,
+					data     : SubmitAdd
+				}).then(res => {
+					this.paySuccess = true
+					
+					this.serviceArr.splice(0,this.serviceArr.length);//清空数组
+					this.serviceArr.push({
+						titleName  : '机构名称',
+						priceName  : '欠款金额',
+						pickerIndex: 0,
+						priceValue : '',
+					})
+					
+					
+					// 跳转结果页面
+					setTimeout(()=>{
+						this.paySuccess = false
+						uni.navigateTo({
+							url: '/pages/result/result'
+						})
+					},3000)
+					
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: "none" 
+					})
+				})
+			},
+			
+			// 微信授权登录
+			onLogin() {
+				authFollow({
+					url: 'http://www.xchengwh9.cn/pages/webview/webview',
+					scopes: ''
+				}).then(res => {
+					window.location.href = res
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: "none" 
+					})
+				})
+			},
+			
+			// 查看历史记录
+			historyClick() {
+				uni.navigateTo({
+				    url: '/pages/result/history'
+				})
+			},
+			
+			// 拨打电话
+			callPhone(e) {
+				uni.makePhoneCall({
+					phoneNumber: this.inviteUser.username
+				})
+			},
+			
+			// 查看温馨提示
+			warmClick() {
+				uni.showModal({
+					title: '温馨提示',
+					content: '新用户可免费计算2个机构，每邀请1名用户完成计算可增加1个机构计算份额。用户计算机构份额上限为5个。',
+					showCancel: false,
+					success: res=> {
+						if (res.confirm) {
+							console.log('用户点击确定');
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			
+			// 复制订单号
+			copyUrl(val) {
+			    const result = h5Copy(val)
+				if (result === false) {
+					uni.showToast({
+						title:'不支持',
+					})
+					return
+				}
+				uni.showToast({
+				   title:'复制成功',
+				   icon:'none'
+				})
+			},
+			
+			// 下载海报
+			shareClick (){
+				this.isImgLay = false
+				this.isImgLong = true
+				
+			},
+			saveSuccess(src) {
+			    this.posterImg = src;
+			},
+			saveFail(err) {}
+		}
+	}
+</script>
+
+<style>
+	.indexTop {
+		width: 100%;
+		height: 440rpx;
+	}
+	
+	.indexTips {
+		position: absolute;
+		top: 0;
+		left: 0;
+		padding: 60rpx 40rpx 0;
+		box-sizing: border-box;
+		color: #fff;
+	}
+	
+	.indexTips-name {
+		font-weight: 600;
+		font-size: 44rpx;
+	}
+	
+	.indexTips-text {
+		margin-top: 20rpx;
+		font-size: 28rpx;
+		display: flex;
+	}
+	
+	.indexTips-warm {
+		width: 34rpx;
+		margin-left: 15rpx;
+		margin-top: 2rpx;
+		
+	}
+	.indexCont {
+		width: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		position: absolute;
+		margin-top: 200rpx;
+		top: 0;
+		left: 0;
+		border-bottom: 140rpx solid transparent;
+	}
+	
+	.indexCont-white {
+		height: 100%;
+		background: white;
+		border-radius: 20rpx;
+	}
+	
+	.indexUser {
+		display: flex;
+		border-bottom: 4rpx solid #f7faff;
+		padding: 40rpx 30rpx;
+		box-sizing: border-box;
+	}
+	
+	.indexUser-left {
+		display: flex;
+		flex: 1;
+	}
+	
+	.indexUser-head {
+		width: 110rpx;
+		height: 110rpx;
+		border-radius: 100%;
+		background-color: #e5ecf6;
+		border: 6rpx solid #e5ecf6;
+		box-sizing: border-box;
+	}
+	
+	.indexUser-head image {
+		border-radius: 100%;
+		width: 100%;
+		height: 100%;
+	}
+	
+	.indexUser-text {
+		width: calc(100% - 150rpx);
+		padding: 0 20rpx;
+		box-sizing: border-box;
+	}
+	
+	.indexUser-name {
+		font-weight: 600;
+		display: flex;
+		font-size: 34rpx;
+		line-height: 58rpx;
+	}
+	
+	.indexUser-tips {
+		font-size: 28rpx;
+	}
+	
+	.indexUser-number {
+		font-size: 30rpx;
+		font-weight: normal;
+		padding-left: 20rpx;
+		box-sizing: border-box;
+		line-height: 62rpx;
+		color: #666666;
+		display: inline-block;
+	}
+	
+	.indexUser-tel {
+		width: 60rpx;
+		height: 60rpx;
+		margin-top: 30rpx;
+	}
+	
+	.list {
+		padding: 20rpx 30rpx;
+		box-sizing: border-box;
+	}
+	
+	.listName {
+		color: #0c58d2;
+		font-weight: 600;
+		font-size: 34rpx;
+		margin: 30rpx 0 ;
+		position: relative;
+	}
+	
+	
+	.list-remove {
+		background-color: #FBE7EE;
+		display: inline-block;
+		position: absolute;
+		padding: 0 20rpx;
+		font-size: 26rpx;
+		font-weight: normal;
+		line-height: 44rpx;
+		color: #d4155a;
+		border-radius: 50rpx;
+		top: 0;
+		right: 0;
+	}
+	
+	.list-remove image {
+		width: 24rpx;
+		height: 24rpx;
+		margin-right: 10rpx;
+		vertical-align: -2rpx;
+	}
+	
+	.listItem-name {
+		margin: 30rpx 0;
+	}
+	
+	.listItem-picker {
+		background-color: #f7faff;
+		border-radius: 15rpx;
+		height: 90rpx;
+		line-height: 90rpx;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		position: relative;
+	}
+	
+	.listItem-picker input {
+		display: block;
+		height: 100%;
+		background-color: transparent;
+	}
+	
+	.listItem-picker-img {
+		width: 30rpx;
+		position: absolute;
+		right: 30rpx;
+		top: 30rpx;
+	}
+	
+	.listAdd {
+		text-align: center;
+		color: #0c58d2;
+		padding: 40rpx 0 40rpx;
+	}
+	
+	.listAdd-btn image {
+		width: 30rpx;
+		vertical-align: middle;
+		margin-right: 10rpx;
+	}
+	
+	.listSubmit {
+		position: fixed;
+		width: 100%;
+		bottom: 0;
+		left: 0;
+		background-color: #f7faff;
+		text-align: center;
+		height: 120rpx;
+	}
+	
+	.listSubmit-btn {
+		width: 90%;
+		display: inline-block;
+		background-color: #0352c8;
+		text-align: center;
+		line-height: 90rpx;
+		border-radius: 100rpx;
+		color: #fff;
+	}
+	
+	.listSubmit-btn.active {
+		background-color: #dcdcdc;
+		color: #666;
+	}
+	
+	/* 漂浮窗 */
+	.showy {
+		position: fixed;
+		right: 0;
+		bottom: 15%;
+		background-color: #fff;
+		box-shadow: 0 0 20rpx rgba(3, 96, 217, .1);
+		z-index: 999;
+		border-radius: 60rpx 0 0 60rpx;
+		padding: 30rpx 0;
+	}
+	
+	.showy-item {
+		text-align: center;
+		padding: 20rpx 30rpx 10rpx 35rpx;
+		font-size: 26rpx;
+		position: relative;
+	}
+	
+	.showy-item-number {
+		position: absolute;
+		right: 5rpx;
+		top: 0;
+		background-color: #ff7171;
+		color: #fff;
+		font-size: 22rpx;
+		border-radius: 80rpx;
+		padding: 0 10rpx;
+		transform: scale(0.83);
+		line-height: 40rpx;
+	}
+	
+	.showy-item-img {
+		width: 44rpx;
+	}
+	
+	.showy-item-name text {
+		display: block;
+	}
+	
+	.postertBack {
+	    width: 100vw;
+	    height: 100vh;
+	    position: fixed;
+	    background-color: rgba(0,0,0,.6);
+	    left: 0;
+	    top: 0;
+	    z-index: 999;
+	}
+	
+	.postertCont {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-box-pack: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 1000;
+		padding: 0 10%;
+		box-sizing: border-box;
+	}
+	
+	.postertContTop {
+		top: -200rpx;
+	}
+	
+	.poster-back {
+		position: relative;
+		padding-top: 100%;
+		width: 100%;
+	}
+	
+	.poster-img, .poster-Cont {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+	
+	.poster-Cont {
+		padding: 50rpx;
+		box-sizing: border-box;
+		color: #fff;
+	}
+	
+	.poster-Cont-code {
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+	
+	.poster-Cont-code image {
+		width: 100%;
+	}
+	
+	.poster-Cont-url {
+		display: flex;
+		padding: 30rpx 0 40rpx;
+	}
+	
+	.poster-url-number {
+		flex: 1;
+		padding-right: 20rpx;
+		box-sizing: border-box;
+	}
+	
+	.poster-url-copy {
+		font-weight: 600;
+	}
+	
+	.poster-Cont-btn {
+		text-align: center;
+	}
+	
+	.poster-Cont-down {
+		display: inline-block;
+		width: 80%;
+		background-color: #fff;
+		border-radius: 80rpx;
+		line-height: 90rpx;
+		color: #051437;
+		font-weight: 600;
+	}
+	
+	.poster-Cont-down-img {
+		width: 40rpx;
+		margin-left: 15rpx;
+		vertical-align: -8rpx;
+		animation: bounce-down 2s linear infinite;
+	}
+	
+	
+	@keyframes bounce-down {
+	    25% {
+	        transform: translateX(-4px);
+	    }
+	
+	    50%,
+	    100% {
+	        transform: translateX(0);
+	    }
+	
+	    75% {
+	        transform: translateX(4px);
+	    }
+	}
+	
+	.sign-img-btn {
+		position: absolute;
+		left: calc(50% - 35rpx);
+		width: 70rpx;
+		top: calc(100% + 240rpx);
+		z-index: 999;
+	}
+	
+	.poster-img-btn {
+		width: 70rpx;
+		display: block;
+		margin: 30rpx auto 0;
+	}
+	
+	
+	.grey {
+	    background-color: #f9f9f9;
+	    z-index: 999999;
+	}
+	
+	/* 是否确认提交 */
+	.tipsBack {
+		position: fixed;
+		width: 100vw;
+		height: 100vh;
+		left: 0;
+		top: 0;
+		z-index: 9999;
+		background-color: rgba(0, 0, 0, .8);
+	}
+	.tipsCont {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-box-pack: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 10000;
+		padding: 0 10%;
+		box-sizing: border-box;
+	}
+	
+	.tipsWhite {
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		overflow: hidden;
+	}
+	
+	.tipsWhite-top {
+		padding: $padding;
+		box-sizing: border-box;
+		text-align: center;
+	}
+	
+	.tipsCont-img {
+		width: 100%;
+	}
+	
+	.tipsWhite-name {
+		text-align: center;
+		color: #111111;
+		font-size: 34rpx;
+		font-weight: 600;
+		margin-bottom: 15rpx;
+	}
+	
+	.tipsWhite-text {
+		font-size: 30rpx;
+		color: #666666;
+		line-height: 48rpx;
+		padding: 0 50rpx;
+		box-sizing: border-box;
+	}
+	
+	.tipsWhite-btn {
+		display: flex;
+		padding: 30rpx 10rpx;
+		box-sizing: border-box;
+	}
+	
+	.tipsWhite-btn-go {
+		flex: 2;
+		color: #fff;
+		margin: 0 15rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		border: 2rpx solid #F6F6F6;
+		background-color: #007df5;
+		border-radius: 20rpx;
+	}
+	
+	.tipsWhite-btn-go:first-child {
+		color: #333333;
+		background-color: #ffffff;
+		border: 2rpx solid #cccccc;
+	}
 </style>
diff --git a/pages/result/history.vue b/pages/result/history.vue
index fe0eb0f..440e9b2 100644
--- a/pages/result/history.vue
+++ b/pages/result/history.vue
@@ -1,708 +1,775 @@
-<template>
-	<view class="content">
-		<block v-if="listsArr.length > 0">
-			<image class="indexTop" src="/static/index_top.png" mode="scaleToFill"></image>
-			<view class="indexTips">
-				<view class="indexTips-name">计算历史记录</view>
-				<view class="indexTips-text">根据您填写的内容生成以下结果</view>
-			</view>
-			<view class="indexCont">
-				<view class="indexCont-white" v-for="(item, index) in listsArr" :key="index">
-					<view class="resultTitle">
-						{{item.institution}}
-					</view>
-					<view class="resultDel" v-if="isSalesman" @click="resultClick(index, item.log_id)">删除记录</view>
-					<view class="resultList">
-						<view class="item">
-							<view class="item-label">
-								<view class="item-label-name">
-									欠款金额：
-								</view>
-								<view class="item-label-text">
-									{{item.total}}元
-								</view>
-							</view>
-							<view :class="{textShadow: item.status != '1'}">
-								<view class="item-label">
-									<view class="item-label-name">
-										首付金额：
-									</view>
-									<view class="item-label-text">
-										{{item.base.first_amount}}元
-									</view>
-								</view>
-								<view class="item-label">
-									<view class="item-label-name">
-										分期金额：
-									</view>
-									<view class="item-label-text">
-										{{item.base.periods_amount}}元
-									</view>
-								</view>
-								<view class="item-label">
-									<view class="item-label-name">
-										分期期数：
-									</view>
-									<view class="item-label-text">
-										{{item.base.periods}}期
-									</view>
-								</view>
-								<view class="item-label">
-									<view class="item-label-name">
-										手续费费率：
-									</view>
-									<view class="item-label-text">
-										{{item.base.tax}}%
-									</view>
-								</view>
-								<view class="item-label">
-									<view class="item-label-name">
-										每期还款本金：
-									</view>
-									<view class="item-label-text">
-										{{item.base.every_total}}元
-									</view>
-								</view>
-								<view class="item-label">
-									<view class="item-label-name">
-										每期还款手续费：
-									</view>
-									<view class="item-label-text">
-										{{item.base.every_tax}}元
-									</view>
-								</view>
-								<view class="item-label">
-									<view class="item-label-name">
-										总还款金额：
-									</view>
-									<view class="item-label-text">
-										{{item.base.total}}元
-									</view>
-								</view>
-								<view class="item-label">
-									<view class="item-label-name">
-										总还款本金：
-									</view>
-									<view class="item-label-text">
-										{{item.base.principal}}元
-									</view>
-								</view>
-								<view class="item-label">
-									<view class="item-label-name">
-										总还款手续费：
-									</view>
-									<view class="item-label-text">
-										{{item.base.tax_amount}}元
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="tips">温馨提示：{{item.description}}</view>
-						<view class="see">
-							<view class="see-go" @click="generalClick(item)" v-if="item.status == '1'">点击查看还款计划表</view>
-							<view class="see-go" @click="unlockClick(item.share)" v-else><image class="indexLock" src="/static/lock.png" mode="widthFix"></image>分享二维码，解锁次数</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</block>
-		<view class="pack-center pages-hint" v-else>
-		    <image src="https://cdn.shuiganying.com/images/2023/04/04/40b2f4bfe2dfb828688fcd3766d6b541.png"></image>
-		    <view class="reportTips">
-		        <view class="reportTips-title">暂无数据</view>
-		        <view class="reportTips-text">抱歉，暂没有历史记录</view>
-		    </view>
-		</view>
-		
-		<!-- 还款计划表弹出 -->
-		<view class="tipsBack" v-if="generalShow" :catchtouchmove="true"></view>
-		<view class="tipsCont" v-if="generalShow" :catchtouchmove="true">
-			<view class="tipsWhite">
-				<view class="tipsTitle">还款计划表（单位：元）</view>
-				<view class="tipsList">
-					<view class="tipsList-tab">
-						<view class="tips-tab-item">期数</view>
-						<view class="tips-tab-item">还款金额</view>
-						<view class="tips-tab-item">本金</view>
-						<view class="tips-tab-item">手续费</view>
-					</view>
-					<view class="tipsList-data">
-						<view class="tipsList-label" v-for="(items, index) in timeArr" :key="index">
-							<view class="tips-label-item">第{{index+1}}期</view>
-							<view class="tips-label-item">{{items.total}}</view>
-							<view class="tips-label-item">{{items.principal}}</view>
-							<view class="tips-label-item">{{items.tax}}</view>
-						</view>
-						<view class="tipsList-label">
-							<view class="tips-label-item">合计</view>
-							<view class="tips-label-item">{{timeAll.total}}</view>
-							<view class="tips-label-item">{{timeAll.principal}}</view>
-							<view class="tips-label-item">{{timeAll.tax}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="tipsWhite-btn">
-					<view @click="otherSee" class="tipsWhite-btn-go">
-						其他还款方式
-					</view>
-				</view>
-				<image class="close" @click="generalShow = false" src="/static/close.png" mode="widthFix"></image>
-			</view>
-		</view>
-	
-		<!-- 邀请好友弹出 -->
-		<view class="postertBack" v-if="isImgLay"></view>
-		<view class="postertCont postertContTop" v-if="isImgLay">
-			<view class="poster-back">
-				<image class="poster-img" src="/static/share_back.png" mode="widthFix"></image>
-				<view class="poster-Cont">
-				    <view class="poster-Cont-code">
-						<image :src="canShare.qrcode" mode="widthFix"></image>
-					</view>
-				    <view class="poster-Cont-url">
-						<view class="nowrap poster-url-number" @click="copyUrl(canShare.url)">地址：{{canShare.url}}/</view>
-						<view class="poster-url-copy">复制</view>
-				    </view>
-					<view class="poster-Cont-btn">
-						<view class="poster-Cont-down" @click="shareClick">保存图片，分享好友<image class="poster-Cont-down-img" src="/static/hand.png" mode="widthFix"></image></view>
-					</view>
-				</view>
-				<image class="sign-img-btn" src="/static/close.png" @click="isImgLay = false" mode="widthFix"></image>
-			</view>
-		</view>
-		
-		<!-- 长按保存 -->
-		<view class="postertBack" v-if="isImgLong"></view>
-		<view class="postertCont" v-if="isImgLong">
-			<view class="poster-back">
-				<image v-if="isImgLong" class="poster-img" :src="posterImg" mode="widthFix"></image>
-				<view class="poster-Cont-btn" style="margin-top: 40rpx; text-align: center;">
-					<view class="poster-Cont-down">请长按图片，保存本地</view>
-					<image class="poster-img-btn" src="/static/close.png" @click="isImgLong = false" mode="widthFix"></image>
-				</view>
-			</view>
-		</view>
-		
-		<!-- 海报canvas -->
-		<vue-canvas-poster :widthPixels="1000" :painting="paintings" @success="saveSuccess" @fail="saveFail"></vue-canvas-poster>
-		
-		<!-- 数据缓冲阶段 -->
-		<view class="pack-center pages-hint grey" v-if="paySuccess">
-		    <image src="/static/loadingGif.gif"></image>
-		    <view>加载中...</view>
-		</view>
+<template>
+	<view class="content">
+		<block v-if="listsArr.length > 0">
+			<image class="indexTop" src="/static/index_top.png" mode="scaleToFill"></image>
+			<view class="indexTips">
+				<view class="indexTips-name">计算历史记录</view>
+				<view class="indexTips-text">根据您填写的内容生成以下结果</view>
+				<view class="indexTips-text">详细业务请联系您的推荐人</view>
+			</view>
+			<view class="indexCont">
+				<view class="indexCont-white" v-for="(item, index) in listsArr" :key="index">
+					<view class="resultTitle">
+						{{item.institution}}
+					</view>
+					<view class="resultDel" v-if="isSalesman" @click="resultClick(index, item.log_id)">删除记录</view>
+					<view class="resultList">
+						<view class="item">
+							<view class="item-label">
+								<view class="item-label-name">
+									欠款金额：
+								</view>
+								<view class="item-label-text">
+									{{item.total}}元
+								</view>
+							</view>
+							<view :class="{textShadow: item.status != '1'}">
+								<view class="item-label">
+									<view class="item-label-name">
+										首付金额：
+									</view>
+									<view class="item-label-text">
+										{{item.base.first_amount}}元
+									</view>
+								</view>
+								<view class="item-label">
+									<view class="item-label-name">
+										分期金额：
+									</view>
+									<view class="item-label-text">
+										{{item.base.periods_amount}}元
+									</view>
+								</view>
+								<view class="item-label">
+									<view class="item-label-name">
+										分期期数：
+									</view>
+									<view class="item-label-text">
+										{{item.base.periods}}期
+									</view>
+								</view>
+								<view class="item-label">
+									<view class="item-label-name">
+										手续费费率：
+									</view>
+									<view class="item-label-text">
+										{{item.base.tax}}%
+									</view>
+								</view>
+								<view class="item-label">
+									<view class="item-label-name">
+										每期还款本金：
+									</view>
+									<view class="item-label-text">
+										{{item.base.every_total}}元
+									</view>
+								</view>
+								<view class="item-label">
+									<view class="item-label-name">
+										每期还款手续费：
+									</view>
+									<view class="item-label-text">
+										{{item.base.every_tax}}元
+									</view>
+								</view>
+								<view class="item-label">
+									<view class="item-label-name">
+										总还款金额：
+									</view>
+									<view class="item-label-text">
+										{{item.base.total}}元
+									</view>
+								</view>
+								<view class="item-label">
+									<view class="item-label-name">
+										总还款本金：
+									</view>
+									<view class="item-label-text">
+										{{item.base.principal}}元
+									</view>
+								</view>
+								<view class="item-label">
+									<view class="item-label-name">
+										总还款手续费：
+									</view>
+									<view class="item-label-text">
+										{{item.base.tax_amount}}元
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="tips">温馨提示：{{item.description}}</view>
+						<view class="see">
+							<view class="see-go" @click="generalClick(item)" v-if="item.status == '1'">点击查看还款计划表</view>
+							<view class="see-go" @click="unlockClick(item.share)" v-else><image class="indexLock" src="/static/lock.png" mode="widthFix"></image>分享二维码，解锁次数</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<view class="pack-center pages-hint" v-else>
+		    <image src="https://cdn.shuiganying.com/images/2023/04/04/40b2f4bfe2dfb828688fcd3766d6b541.png"></image>
+		    <view class="reportTips">
+		        <view class="reportTips-title">暂无数据</view>
+		        <view class="reportTips-text">抱歉，暂没有历史记录</view>
+		    </view>
+		</view>
+		
+		<!-- 还款计划表弹出 -->
+		<view class="tipsBack" v-if="generalShow" :catchtouchmove="true"></view>
+		<view class="tipsCont" v-if="generalShow" :catchtouchmove="true">
+			<view class="tipsWhite">
+				<view class="tipsTitle">
+					<view class="tipsTitle-name">还款计划表（单位：元）</view>
+					<view class="tipsTitle-bottom">
+						<picker :range="periodsPay" class="tipsTitle-picker" @change="periodsChange">
+							<view class="uni-input">选择还款期数：{{periodsPay[periodsIndex]}}期</view>
+							<image src="/static/basic_down.png" class="tipsTitle-picker-img" mode="widthFix"></image>
+						</picker>
+					</view>
+				</view>
+				<view class="tipsList">
+					<view class="tipsList-tab">
+						<view class="tips-tab-item">期数</view>
+						<view class="tips-tab-item">还款金额</view>
+						<view class="tips-tab-item">本金</view>
+						<view class="tips-tab-item">手续费</view>
+					</view>
+					<view class="tipsList-data">
+						<view class="tipsList-label" v-for="(items, index) in periodsArr" :key="index">
+							<view class="tips-label-item">第{{index+1}}期</view>
+							<view class="tips-label-item">{{items.total}}</view>
+							<view class="tips-label-item">{{items.principal}}</view>
+							<view class="tips-label-item">{{items.tax}}</view>
+						</view>
+						<view class="tipsList-label">
+							<view class="tips-label-item">合计</view>
+							<view class="tips-label-item">{{timeAll.total}}</view>
+							<view class="tips-label-item">{{timeAll.principal}}</view>
+							<view class="tips-label-item">{{timeAll.tax}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="tipsWhite-btn">
+					<view @click="otherSee" class="tipsWhite-btn-go">
+						其他还款方式
+					</view>
+				</view>
+				<image class="close" @click="generalShow = false" src="/static/close.png" mode="widthFix"></image>
+			</view>
+		</view>
+	
+		<!-- 邀请好友弹出 -->
+		<view class="postertBack" v-if="isImgLay"></view>
+		<view class="postertCont postertContTop" v-if="isImgLay">
+			<view class="poster-back">
+				<image class="poster-img" src="/static/share_back.png" mode="widthFix"></image>
+				<view class="poster-Cont">
+				    <view class="poster-Cont-code">
+						<image :src="canShare.qrcode" mode="widthFix"></image>
+					</view>
+				    <view class="poster-Cont-url">
+						<view class="nowrap poster-url-number" @click="copyUrl(canShare.url)">地址：{{canShare.url}}/</view>
+						<view class="poster-url-copy">复制</view>
+				    </view>
+					<view class="poster-Cont-btn">
+						<view class="poster-Cont-down" @click="shareClick">保存图片，分享好友<image class="poster-Cont-down-img" src="/static/hand.png" mode="widthFix"></image></view>
+					</view>
+				</view>
+				<image class="sign-img-btn" src="/static/close.png" @click="isImgLay = false" mode="widthFix"></image>
+			</view>
+		</view>
+		
+		<!-- 长按保存 -->
+		<view class="postertBack" v-if="isImgLong"></view>
+		<view class="postertCont" v-if="isImgLong">
+			<view class="poster-back">
+				<image v-if="isImgLong" class="poster-img" :src="posterImg" mode="widthFix"></image>
+				<view class="poster-Cont-btn" style="margin-top: 40rpx; text-align: center;">
+					<view class="poster-Cont-down">请长按图片，保存本地</view>
+					<image class="poster-img-btn" src="/static/close.png" @click="isImgLong = false" mode="widthFix"></image>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 海报canvas -->
+		<vue-canvas-poster :widthPixels="1000" :painting="paintings" @success="saveSuccess" @fail="saveFail"></vue-canvas-poster>
+		
+		<!-- 数据缓冲阶段 -->
+		<view class="pack-center pages-hint grey" v-if="paySuccess">
+		    <image src="/static/loadingGif.gif"></image>
+		    <view>加载中...</view>
+		</view>
 	</view>
 </template>
 
-<script>
-	import { Init, Lists, logDel } from '@/apis/interfaces/index'
-	import { VueCanvasPoster } from 'vue-canvas-poster'
-	export default {
-		components: {
-		    VueCanvasPoster
-		},
-		data() {
-			return {
-				listsArr   : [], // 结果列表
-				timeArr    : [], // 还款计划表列表
-				timeAll    : '', // 还款计划表总计
-				otherArr   : '', // 其他携带数据
-				isSalesman : '',    // 客户管理
-				generalShow: false,
-				paySuccess : true,
-				
-				// 海报
-				canShare   : '',    // 分享图片
-				isImgLay   : false, // 是否显示图片弹出层
-				isImgLong  : false,// 长按保存图片
-				paintings  : {
-				    width: "375px",
-				    height: "375px",
-				    borderRadius: "10px",
-				    background: "#ffffff",
-				    views: [
-				        //海报背景
-				        {
-				            type: "image",
-				            url: "/static/share_downback.png",
-				            css: {
-				                top: "0",
-				                left: "0",
-				                width: "375px",
-				                height: "375px",
-				                mode: 'aspectFill'
-				            },
-				        },
-				        
-				        //二维码
-				        {
-				            type: "image",
-				            url: "",
-				            css: {
-				                top: "60px",
-				                left: "60px",
-				                width: "255px",
-				                height: "255px",
-				                mode: 'aspectFill'
-				            },
-				        }
-				    ],
-				},
-				posterImg: "", //生成的海报图片路径
-			}
-		},
-		onShow() {
-			Init().then(res => {
-				this.isSalesman  = res.is_salesman
-			}).catch(err => {
-				uni.showToast({
-					title: err.message,
-					icon: "none" 
-				})
-			})
-			
-			// 获取历史结果
-			this.listsInfo()
-		},
-		
-		methods: {
-			// 历史结果
-			listsInfo() {
-				Lists().then(res => {
-					this.paySuccess = false
-					this.listsArr = res
-				}).catch(err => {
-					uni.showToast({
-						title: err.message,
-						icon: "none" 
-					})
-				})
-			},
-			
-			// 删除结果
-			resultClick(index, id) {
-				uni.showModal({
-					title: '删除确认',
-					content: '是否删除此计算记录',
-					success: res=> {
-						if (res.confirm) {
-							logDel(id).then(res => {
-								this.listsArr.splice(index, 1)
-							}).catch(err => {
-								uni.showToast({
-									title: err.message,
-									icon: "none" 
-								})
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-				
-			},
-			
-			// 查看还款计划表
-			generalClick(arr){
-				this.otherArr    = arr
-				this.timeArr     = arr.project
-				this.timeAll     = arr.project_total
-				this.generalShow = !this.generalShow
-			},
-			
-			// 其他方式
-			otherSee() {
-				let newData = JSON.stringify(this.otherArr);
-				uni.navigateTo({
-					url: `/pages/result/other?data=${encodeURIComponent(newData)}`
-				})
-				
-				this.generalShow = false
-			},
-			
-			// 显示海报
-			unlockClick(share) {
-				this.paintings.views[1].url  = share.qrcode
-				this.isImgLay  = true
-				this.canShare  = share
-			},
-			
-			// 下载海报
-			shareClick (){
-				this.isImgLay  = false
-				this.isImgLong = true
-				
-			},
-			
-			saveSuccess(src) {
-			    this.posterImg = src;
-			},
-			saveFail(err) {},
-		}
-	}
-</script>
-
-<style>
-	.indexTop {
-		width: 100%;
-		height: 440rpx;
-	}
-	
-	.indexTips {
-		position: absolute;
-		top: 0;
-		left: 0;
-		padding: 60rpx 40rpx 0;
-		box-sizing: border-box;
-		color: #fff;
-	}
-	
-	.indexTips-name {
-		font-weight: 600;
-		font-size: 44rpx;
-	}
-	
-	.indexTips-text {
-		margin-top: 20rpx;
-		font-size: 28rpx;
-	}
-	
-	.indexCont {
-		width: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		position: absolute;
-		margin-top: 200rpx;
-		top: 0;
-		left: 0;
-	}
-	
-	.indexCont-white {
-		height: 100%;
-		background: white;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-		margin-bottom: 30rpx;
-		position: relative;
-	}
-	
-	.resultDel {
-		position: absolute;
-		right: 30rpx;
-		top: 30rpx;
-		background-color: #ff7171;
-		color: #ffffff;
-		border-radius: 80rpx;
-		line-height: 52rpx;
-		padding: 0 24rpx;
-		display: inline-block;
-		font-size: 26rpx;
-	}
-	
-	.resultTitle {
-		font-weight: 600;
-		font-size: 34rpx;
-		color: #0c58d2;
-		margin-bottom: 20rpx;
-	}
-	
-	.item-label {
-		line-height: 48rpx;
-		padding: 15rpx 0;
-		display: flex;
-		margin-right: 20rpx;
-		font-weight: 400;
-	}
-	
-	.item-label-name {
-		color: #999999;
-	}
-	
-	.textShadow {
-		filter: blur(6px);
-	}
-	
-	.tips {
-		font-weight: 400;
-		background-color: #f7faff;
-		border-radius: 10rpx;
-		padding: 20rpx 30rpx;
-		text-align: justify;
-		box-sizing: border-box;
-		font-size: 26rpx;
-		color: #999999;
-		line-height: 40rpx;
-		margin-top: 20rpx;
-	}
-	
-	.see {
-		text-align: center;
-		margin-top: 30rpx;
-	}
-	
-	.see-go {
-		display: inline-block;
-		border: 2rpx solid #0c58d2;
-		color: #0c58d2;
-		line-height: 74rpx;
-		padding: 0 25rpx;
-		border-radius: 10rpx;
-	}
-	
-	.indexLock {
-		width: 34rpx;
-		vertical-align: -4rpx;
-		margin-right: 10rpx;
-	}
-	
-	
-	/* 计划表弹出 */
-	.tipsBack {
-		position: fixed;
-		width: 100vw;
-		height: 100vh;
-		left: 0;
-		top: 0;
-		z-index: 9;
-		background-color: rgba(0, 0, 0, .6);
-	}
-	.tipsCont {
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-box-pack: center;
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		z-index: 10;
-		padding: 0 10%;
-		box-sizing: border-box;
-		text-align: center;
-	}
-	
-	.tipsWhite {
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-		position: relative;
-	}
-	
-	.close {
-		position: absolute;
-		left: calc(50% - 35rpx);
-		width: 70rpx;
-		bottom: -120rpx;
-		z-index: 999;
-	}
-	
-	.tipsTitle {
-		font-weight: 600;
-		font-size: 34rpx;
-	}
-	
-	.tipsList {
-		margin: 20rpx 0;
-		font-size: 28rpx;
-		font-weight: 400;
-	}
-	
-	.tipsList-tab {
-		display: flex;
-		background: #e5edf8;
-		line-height: 90rpx;
-		border-radius: 20rpx 20rpx 0 0;
-	}
-	
-	.tips-tab-item, .tips-label-item {
-		flex: 4;
-		text-align: center;
-	}
-	.tipsList-data {
-		background: #fafafa;
-		border-radius: 0 0 20rpx 20rpx;
-		max-height: 30vh;
-		overflow: hidden;
-		overflow-y: scroll;
-	}
-	.tipsList-label {
-		display: flex;
-		line-height: 80rpx;
-		border-bottom: 2rpx solid #eeeeee;
-	}
-	
-	.tipsList-label:last-child {
-		border: none;
-	}
-	
-	.tipsWhite-btn {
-		text-align: center;
-		padding: 30rpx 0 20rpx;
-	}
-	
-	.tipsWhite-btn-go {
-		display: inline-block;
-		width: 70%;
-		line-height: 88rpx;
-		border-radius: 80rpx;
-		background-color: #0c58d2;
-		color: #fff;
-	}
-	
-	.postertBack {
-	    width: 100vw;
-	    height: 100vh;
-	    position: fixed;
-	    background-color: rgba(0,0,0,.6);
-	    left: 0;
-	    top: 0;
-	    z-index: 999;
-	}
-	
-	.postertCont {
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-box-pack: center;
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		z-index: 1000;
-		padding: 0 10%;
-		box-sizing: border-box;
-	}
-	
-	.postertContTop {
-		top: -200rpx;
-	}
-	
-	.poster-back {
-		position: relative;
-		padding-top: 100%;
-		width: 100%;
-	}
-	
-	.poster-img, .poster-Cont {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		left: 0;
-		top: 0;
-	}
-	
-	.poster-Cont {
-		padding: 50rpx;
-		box-sizing: border-box;
-		color: #fff;
-	}
-	
-	.poster-Cont-code {
-		background: #fff;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-	}
-	
-	.poster-Cont-code image {
-		width: 100%;
-	}
-	
-	.poster-Cont-url {
-		display: flex;
-		padding: 30rpx 0 40rpx;
-	}
-	
-	.poster-url-number {
-		flex: 1;
-		padding-right: 20rpx;
-		box-sizing: border-box;
-	}
-	
-	.poster-url-copy {
-		font-weight: 600;
-	}
-	
-	.poster-Cont-btn {
-		text-align: center;
-	}
-	
-	.poster-Cont-down {
-		display: inline-block;
-		width: 80%;
-		background-color: #fff;
-		border-radius: 80rpx;
-		line-height: 90rpx;
-		color: #051437;
-		font-weight: 600;
-	}
-	
-	.poster-Cont-down-img {
-		width: 40rpx;
-		margin-left: 15rpx;
-		vertical-align: -8rpx;
-		animation: bounce-down 2s linear infinite;
-	}
-	
-	
-	@keyframes bounce-down {
-	    25% {
-	        transform: translateX(-4px);
-	    }
-	
-	    50%,
-	    100% {
-	        transform: translateX(0);
-	    }
-	
-	    75% {
-	        transform: translateX(4px);
-	    }
-	}
-	
-	.sign-img-btn {
-		position: absolute;
-		left: calc(50% - 35rpx);
-		width: 70rpx;
-		top: calc(100% + 240rpx);
-		z-index: 999;
-	}
-	
-	.poster-img-btn {
-		width: 70rpx;
-		display: block;
-		margin: 30rpx auto 0;
-	}
-	
-	/* 暂无数据 */
-	.reportTips-title {
-	    color: #000;
-	    font-size: 34rpx;
-	    line-height: 80rpx;
-	}
-	
-	.reportTips-text {
-	    font-size: 26rpx;
-	}
-	
-	.reportTips-btn {
-	    background-color: #3b7cff;
-	    display: inline-block;
-	    color: #fff;
-	    line-height: 78rpx;
-	    padding: 0 60rpx;
-	    border-radius: 10rpx;
-	    margin-top: 50rpx;
-	}
-	
-	.pack-center {
-		z-index: 99999;
-	}
-	
-	.grey {
-	    background-color: #f9f9f9;
-	    z-index: 9999999;
-	}
+<script>
+	import { Init, Lists, logDel } from '@/apis/interfaces/index'
+	import { VueCanvasPoster } from 'vue-canvas-poster'
+	export default {
+		components: {
+		    VueCanvasPoster
+		},
+		data() {
+			return {
+				listsArr   : [], // 结果列表
+				timeArr    : [], // 还款计划表列表
+				timeAll    : '', // 还款计划表总计
+				otherArr   : '', // 其他携带数据
+				isSalesman : '',    // 客户管理
+				generalShow: false,
+				paySuccess : true,
+				periodsPay : [],
+				periodsArr : [],
+				periodsIndex: 0,
+				
+				// 海报
+				canShare   : '',    // 分享图片
+				isImgLay   : false, // 是否显示图片弹出层
+				isImgLong  : false,// 长按保存图片
+				paintings  : {
+				    width: "375px",
+				    height: "375px",
+				    borderRadius: "10px",
+				    background: "#ffffff",
+				    views: [
+				        //海报背景
+				        {
+				            type: "image",
+				            url: "/static/share_downback.png",
+				            css: {
+				                top: "0",
+				                left: "0",
+				                width: "375px",
+				                height: "375px",
+				                mode: 'aspectFill'
+				            },
+				        },
+				        
+				        //二维码
+				        {
+				            type: "image",
+				            url: "",
+				            css: {
+				                top: "60px",
+				                left: "60px",
+				                width: "255px",
+				                height: "255px",
+				                mode: 'aspectFill'
+				            },
+				        },
+						
+						// 文本一
+						{
+						    type: "text",
+						    text: '盘债计算器',
+						    css: {
+						        top: "300px",
+						        left: "134px",
+								width: "375px",
+						        fontSize: "20px",
+						        color: "#000000"
+						    },
+						},
+				    ],
+				},
+				posterImg: "", //生成的海报图片路径
+			}
+		},
+		onShow() {
+			Init().then(res => {
+				this.isSalesman  = res.is_salesman
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon: "none" 
+				})
+			})
+			
+			// 获取历史结果
+			this.listsInfo()
+		},
+		
+		methods: {
+			// 历史结果
+			listsInfo() {
+				Lists().then(res => {
+					this.paySuccess = false
+					this.listsArr = res
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: "none" 
+					})
+				})
+			},
+			
+			// 删除结果
+			resultClick(index, id) {
+				uni.showModal({
+					title: '删除确认',
+					content: '是否删除此计算记录',
+					success: res=> {
+						if (res.confirm) {
+							logDel(id).then(res => {
+								this.listsArr.splice(index, 1)
+							}).catch(err => {
+								uni.showToast({
+									title: err.message,
+									icon: "none" 
+								})
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+				
+			},
+			
+			// 查看还款计划表
+			generalClick(arr){
+				this.otherArr    = arr
+				this.timeArr     = arr.project
+				this.periodsPay  = arr.periods
+				this.generalShow = !this.generalShow
+				
+				// 还款计划表
+				let newValue = arr.periods[this.periodsIndex]
+				for(var item in arr.project){
+					if(newValue == item){
+						var jValue = arr.project[item];
+						this.periodsArr = jValue.data
+						this.timeAll    = jValue.total
+					} 
+				}
+			},
+			
+			// 其他方式
+			otherSee() {
+				let newData = JSON.stringify(this.otherArr);
+				uni.navigateTo({
+					url: `/pages/result/other?data=${encodeURIComponent(newData)}`
+				})
+				
+				this.generalShow = false
+			},
+			
+			// 显示海报
+			unlockClick(share) {
+				this.paintings.views[1].url  = share.qrcode
+				this.isImgLay  = true
+				this.canShare  = share
+			},
+			
+			// 选择期数
+			periodsChange(e) {
+				this.periodsIndex = e.detail.value
+				let newValue = this.periodsPay[this.periodsIndex]
+				for(var item in this.timeArr){
+					if(newValue == item){
+						var jValue = this.timeArr[item];
+						this.periodsArr = jValue.data
+						this.timeAll    = jValue.total
+					} 
+				} 
+			},
+			
+			// 下载海报
+			shareClick (){
+				this.isImgLay  = false
+				this.isImgLong = true
+				
+			},
+			
+			saveSuccess(src) {
+			    this.posterImg = src;
+			},
+			saveFail(err) {},
+		}
+	}
+</script>
+
+<style>
+	.indexTop {
+		width: 100%;
+		height: 440rpx;
+	}
+	
+	.indexTips {
+		position: absolute;
+		top: 0;
+		left: 0;
+		padding: 60rpx 40rpx 0;
+		box-sizing: border-box;
+		color: #fff;
+	}
+	
+	.indexTips-name {
+		font-weight: 600;
+		font-size: 44rpx;
+	}
+	
+	.indexTips-text {
+		margin-top: 20rpx;
+		font-size: 28rpx;
+	}
+	
+	.indexCont {
+		width: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		position: absolute;
+		margin-top: 240rpx;
+		top: 0;
+		left: 0;
+	}
+	
+	.indexCont-white {
+		height: 100%;
+		background: white;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		margin-bottom: 30rpx;
+		position: relative;
+	}
+	
+	.resultDel {
+		position: absolute;
+		right: 30rpx;
+		top: 30rpx;
+		background-color: #ff7171;
+		color: #ffffff;
+		border-radius: 80rpx;
+		line-height: 52rpx;
+		padding: 0 24rpx;
+		display: inline-block;
+		font-size: 26rpx;
+	}
+	
+	.resultTitle {
+		font-weight: 600;
+		font-size: 34rpx;
+		color: #0c58d2;
+		margin-bottom: 20rpx;
+	}
+	
+	.item-label {
+		line-height: 48rpx;
+		padding: 15rpx 0;
+		display: flex;
+		margin-right: 20rpx;
+		font-weight: 400;
+	}
+	
+	.item-label-name {
+		color: #999999;
+	}
+	
+	.textShadow {
+		filter: blur(6px);
+	}
+	
+	.tips {
+		font-weight: 400;
+		background-color: #f7faff;
+		border-radius: 10rpx;
+		padding: 20rpx 30rpx;
+		text-align: justify;
+		box-sizing: border-box;
+		font-size: 26rpx;
+		color: #999999;
+		line-height: 40rpx;
+		margin-top: 20rpx;
+	}
+	
+	.see {
+		text-align: center;
+		margin-top: 30rpx;
+	}
+	
+	.see-go {
+		display: inline-block;
+		border: 2rpx solid #0c58d2;
+		color: #0c58d2;
+		line-height: 74rpx;
+		padding: 0 25rpx;
+		border-radius: 10rpx;
+	}
+	
+	.indexLock {
+		width: 34rpx;
+		vertical-align: -4rpx;
+		margin-right: 10rpx;
+	}
+	
+	
+	/* 计划表弹出 */
+	.tipsBack {
+		position: fixed;
+		width: 100vw;
+		height: 100vh;
+		left: 0;
+		top: 0;
+		z-index: 9;
+		background-color: rgba(0, 0, 0, .6);
+	}
+	.tipsCont {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-box-pack: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 10;
+		padding: 0 10%;
+		box-sizing: border-box;
+		text-align: center;
+	}
+	
+	.tipsWhite {
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		position: relative;
+	}
+	
+	.close {
+		position: absolute;
+		left: calc(50% - 35rpx);
+		width: 70rpx;
+		bottom: -120rpx;
+		z-index: 999;
+	}
+	
+	.tipsTitle-name {
+		font-weight: 600;
+		font-size: 34rpx;
+	}
+	
+	.tipsTitle-bottom {
+		text-align: right;
+		position: relative;
+		margin: 30rpx 0;
+		font-size: 28rpx;
+	}
+	
+	.tipsTitle-picker {
+		padding-right: 40rpx;
+		box-sizing: border-box;
+	}
+	
+	.tipsTitle-picker-img {
+		width: 24rpx;
+		position: absolute;
+		top: 6rpx;
+		right: 0;
+	}
+	
+	.tipsList {
+		margin: 20rpx 0;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+	
+	.tipsList-tab {
+		display: flex;
+		background: #e5edf8;
+		line-height: 90rpx;
+		border-radius: 20rpx 20rpx 0 0;
+	}
+	
+	.tips-tab-item, .tips-label-item {
+		flex: 4;
+		text-align: center;
+	}
+	.tipsList-data {
+		background: #fafafa;
+		border-radius: 0 0 20rpx 20rpx;
+		max-height: 30vh;
+		overflow: hidden;
+		overflow-y: scroll;
+	}
+	.tipsList-label {
+		display: flex;
+		line-height: 80rpx;
+		border-bottom: 2rpx solid #eeeeee;
+	}
+	
+	.tipsList-label:last-child {
+		border: none;
+	}
+	
+	.tipsWhite-btn {
+		text-align: center;
+		padding: 30rpx 0 20rpx;
+	}
+	
+	.tipsWhite-btn-go {
+		display: inline-block;
+		width: 70%;
+		line-height: 88rpx;
+		border-radius: 80rpx;
+		background-color: #0c58d2;
+		color: #fff;
+	}
+	
+	.postertBack {
+	    width: 100vw;
+	    height: 100vh;
+	    position: fixed;
+	    background-color: rgba(0,0,0,.6);
+	    left: 0;
+	    top: 0;
+	    z-index: 999;
+	}
+	
+	.postertCont {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-box-pack: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 1000;
+		padding: 0 10%;
+		box-sizing: border-box;
+	}
+	
+	.postertContTop {
+		top: -200rpx;
+	}
+	
+	.poster-back {
+		position: relative;
+		padding-top: 100%;
+		width: 100%;
+	}
+	
+	.poster-img, .poster-Cont {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+	
+	.poster-Cont {
+		padding: 50rpx;
+		box-sizing: border-box;
+		color: #fff;
+	}
+	
+	.poster-Cont-code {
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+	
+	.poster-Cont-code image {
+		width: 100%;
+	}
+	
+	.poster-Cont-url {
+		display: flex;
+		padding: 30rpx 0 40rpx;
+	}
+	
+	.poster-url-number {
+		flex: 1;
+		padding-right: 20rpx;
+		box-sizing: border-box;
+	}
+	
+	.poster-url-copy {
+		font-weight: 600;
+	}
+	
+	.poster-Cont-btn {
+		text-align: center;
+	}
+	
+	.poster-Cont-down {
+		display: inline-block;
+		width: 80%;
+		background-color: #fff;
+		border-radius: 80rpx;
+		line-height: 90rpx;
+		color: #051437;
+		font-weight: 600;
+	}
+	
+	.poster-Cont-down-img {
+		width: 40rpx;
+		margin-left: 15rpx;
+		vertical-align: -8rpx;
+		animation: bounce-down 2s linear infinite;
+	}
+	
+	
+	@keyframes bounce-down {
+	    25% {
+	        transform: translateX(-4px);
+	    }
+	
+	    50%,
+	    100% {
+	        transform: translateX(0);
+	    }
+	
+	    75% {
+	        transform: translateX(4px);
+	    }
+	}
+	
+	.sign-img-btn {
+		position: absolute;
+		left: calc(50% - 35rpx);
+		width: 70rpx;
+		top: calc(100% + 240rpx);
+		z-index: 999;
+	}
+	
+	.poster-img-btn {
+		width: 70rpx;
+		display: block;
+		margin: 30rpx auto 0;
+	}
+	
+	/* 暂无数据 */
+	.reportTips-title {
+	    color: #000;
+	    font-size: 34rpx;
+	    line-height: 80rpx;
+	}
+	
+	.reportTips-text {
+	    font-size: 26rpx;
+	}
+	
+	.reportTips-btn {
+	    background-color: #3b7cff;
+	    display: inline-block;
+	    color: #fff;
+	    line-height: 78rpx;
+	    padding: 0 60rpx;
+	    border-radius: 10rpx;
+	    margin-top: 50rpx;
+	}
+	
+	.pack-center {
+		z-index: 99999;
+	}
+	
+	.grey {
+	    background-color: #f9f9f9;
+	    z-index: 9999999;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/result/other.vue b/pages/result/other.vue
index 8f447ca..cbbd93e 100644
--- a/pages/result/other.vue
+++ b/pages/result/other.vue
@@ -1,251 +1,318 @@
-<template>
-	<view class="content">
-		<image class="indexTop" src="/static/index_top.png" mode="scaleToFill"></image>
-		<view class="indexTips">
-			<view class="indexTips-name">其他还款方式</view>
-			<view class="indexTips-text">根据您填写的内容生成以下结果</view>
-		</view>
-		<view class="indexCont">
-			<view class="indexCont-white">
-				<view class="item">
-					<view class="item-label">
-						<view class="item-label-name">
-							机构名称：
-						</view>
-						<view class="item-label-text">
-							{{listsArr.institution}}
-						</view>
-					</view>
-					<view class="item-label">
-						<view class="item-label-name">
-							欠款金额：
-						</view>
-						<view class="item-label-text">
-							{{listsArr.total}}元
-						</view>
-					</view>
-				</view>
-				
-				<view class="tipsTitle">其他还款表（单位：元）</view>
-				
-				<view class="tipsList">
-					<view class="tipsList-tab">
-						<view class="tips-label-item">期数</view>
-						<view class="tips-tab-item">刷POS</view>
-						<view class="tips-tab-item">分期还款</view>
-						<view class="tips-tab-item">最低还款</view>
-						<view class="tips-tab-item">逾期不还</view>
-					</view>
-					<view class="tipsList-data">
-						<view class="tipsList-label" v-for="(items, index) in listsArr.other" :key="index">
-							<view class="tips-label-item">第{{index+1}}期</view>
-							<view class="tips-label-item">{{items.pos}}</view>
-							<view class="tips-label-item">{{items.stages}}</view>
-							<view class="tips-label-item">{{items.mincash}}</view>
-							<view class="tips-label-item">{{items.overdue}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="list">
-					<view class="list-label">
-						<view class="list-name">POS合计：</view>
-						<view class="list-text">{{listsArr.other_total.pos_add}}元</view>
-					</view>
-					<view class="list-label">
-						<view class="list-name">分期合计：</view>
-						<view class="list-text">{{listsArr.other_total.stages_add}}元</view>
-					</view>
-					<view class="list-label">
-						<view class="list-name">最低合计：</view>
-						<view class="list-text">{{listsArr.other_total.mincash_add}}元</view>
-					</view>
-					<view class="list-label">
-						<view class="list-name">逾期合计：</view>
-						<view class="list-text">{{listsArr.other_total.overdue_add}}元</view>
-					</view>
-					<view class="list-label">
-						<view class="list-name">外加偿还本金：</view>
-						<view class="list-text">{{listsArr.other_total.principal}}元</view>
-					</view>
-				</view>
-			</view>
-			
-			<navigator hover-class="none" open-type="navigateBack" class="return">返回</navigator>
-		</view>
+<template>
+	<view class="content">
+		<image class="indexTop" src="/static/index_top.png" mode="scaleToFill"></image>
+		<view class="indexTips">
+			<view class="indexTips-name">其他还款方式</view>
+			<view class="indexTips-text">根据您填写的内容生成以下结果</view>
+		</view>
+		<view class="indexCont">
+			<view class="indexCont-white">
+				<view class="item">
+					<view class="item-label">
+						<view class="item-label-name">
+							机构名称：
+						</view>
+						<view class="item-label-text">
+							{{listsInfo.title}}
+						</view>
+					</view>
+					<view class="item-label">
+						<view class="item-label-name">
+							欠款金额：
+						</view>
+						<view class="item-label-text">
+							{{listsInfo.total}}元
+						</view>
+					</view>
+				</view>
+				<view class="tipsTitle">
+					<view class="tipsTitle-name">其他还款表（单位：元）</view>
+					<view class="tipsTitle-bottom">
+						<picker :range="periodsPay" class="tipsTitle-picker" @change="periodsChange">
+							<view class="uni-input">选择还款期数：{{periodsPay[periodsIndex]}}期</view>
+							<image src="/static/basic_down.png" class="tipsTitle-picker-img" mode="widthFix"></image>
+						</picker>
+					</view>
+				</view>
+				
+				<view class="tipsList">
+					<view class="tipsList-tab">
+						<view class="tips-label-item">期数</view>
+						<view class="tips-tab-item">刷POS</view>
+						<view class="tips-tab-item">分期还款</view>
+						<view class="tips-tab-item">最低还款</view>
+						<view class="tips-tab-item">逾期不还</view>
+					</view>
+					<view class="tipsList-data">
+						<view class="tipsList-label" v-for="(items, index) in listsArr" :key="index">
+							<view class="tips-label-item">第{{index+1}}期</view>
+							<view class="tips-label-item">{{items.pos}}</view>
+							<view class="tips-label-item">{{items.stages}}</view>
+							<view class="tips-label-item">{{items.mincash}}</view>
+							<view class="tips-label-item">{{items.overdue}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="list">
+					<view class="list-label">
+						<view class="list-name">POS费用合计：</view>
+						<view class="list-text">{{listsTotal.pos_add}}元</view>
+					</view>
+					<view class="list-label">
+						<view class="list-name">分期费用合计：</view>
+						<view class="list-text">{{listsTotal.stages_add}}元</view>
+					</view>
+					<view class="list-label">
+						<view class="list-name">最低费用合计：</view>
+						<view class="list-text">{{listsTotal.mincash_add}}元</view>
+					</view>
+					<view class="list-label">
+						<view class="list-name">逾期费用合计：</view>
+						<view class="list-text">{{listsTotal.overdue_add}}元</view>
+					</view>
+					<view class="list-label border-top">
+						<view class="list-name">外加偿还本金：</view>
+						<view class="list-text">{{listsTotal.principal}}元</view>
+					</view>
+				</view>
+			</view>
+			
+			<navigator hover-class="none" open-type="navigateBack" class="return">返回</navigator>
+		</view>
 	</view>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				listsArr   : '', // 结果列表
-			}
-		},
-		onLoad(options){
-			let dData    = decodeURIComponent(options.data);
-			let newdData = JSON.parse(dData)
-			this.listsArr = newdData
-			console.log(newdData)
-		},
-		created() {
-			
-		},
-		
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-	.indexTop {
-		width: 100%;
-		height: 440rpx;
-	}
-	
-	.indexTips {
-		position: absolute;
-		top: 0;
-		left: 0;
-		padding: 60rpx 40rpx 0;
-		box-sizing: border-box;
-		color: #fff;
-	}
-	
-	.indexTips-name {
-		font-weight: 600;
-		font-size: 44rpx;
-	}
-	
-	.indexTips-text {
-		margin-top: 20rpx;
-		font-size: 28rpx;
-	}
-	
-	.indexCont {
-		width: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		position: absolute;
-		margin-top: 240rpx;
-		top: 0;
-		left: 0;
-	}
-	
-	.indexCont-white {
-		height: 100%;
-		background: white;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-		margin-bottom: 30rpx;
-		position: relative;
-	}
-	.indexCont-white::after,
-	.indexCont-white::before {
-		position: absolute;
-		content: '';
-		background-color: rgba(255, 255, 255, .4);
-		left: 20rpx;
-		border-radius: 20rpx 20rpx 0 0;
-	}
-	.indexCont-white::after {
-		z-index: 2;
-		width: calc(100% - 40rpx);
-		left: 20rpx;
-		top: -25rpx;
-		height: 25px;
-	}
-	.indexCont-white::before {
-		z-index: 1;
-		width: calc(100% - 80rpx);
-		left: 40rpx;
-		top: -50rpx;
-		height: 50rpx;
-	}
-	
-	.item {
-		overflow: hidden;
-	}
-	
-	.item-label {
-		line-height: 48rpx;
-		padding: 15rpx 0;
-		display: flex;
-		margin-right: 20rpx;
-		font-weight: 400;
-	}
-	
-	.item-label-name {
-		color: #999999;
-	}
-	
-	.list {
-		border-top: 2rpx dotted #eeeeee;
-		margin-top: 30rpx;
-		padding-top: 10rpx;
-	}
-	
-	.list-label {
-		display: flex;
-		padding: 30rpx 0 10rpx;
-	}
-	
-	.list-name {
-		flex: 1;
-	}
-	
-	.list-text {
-		font-weight: 600;
-	}
-	
-	.return {
-		margin-top: 50rpx;
-		margin-bottom: 30rpx;
-		width: 100%;
-		background-color: #fff;
-		border-radius: 80rpx;
-		line-height: 88rpx;
-		text-align: center;
-		color: #0c58d2;
-		border: 2rpx solid #0c58d2;
-	}
-	
-	.tipsTitle {
-		font-size: 28rpx;
-		margin-top: 30rpx;
-		color: #0c58d2;
-	}
-	
-	.tipsList {
-		margin: 20rpx 0;
-		font-size: 26rpx;
-		font-weight: 400;
-		border: 1px solid #eee;;
-		border-radius: 20rpx;
-	}
-	
-	.tipsList-tab {
-		display: flex;
-		background: #e5edf8;
-		line-height: 90rpx;
-		border-radius: 20rpx 20rpx 0 0;
-	}
-	
-	.tips-tab-item, .tips-label-item {
-		flex: 4;
-		text-align: center;
-	}
-	
-	.tipsList-label {
-		display: flex;
-		line-height: 80rpx;
-		background: #fafafa;
-		border-bottom: 2rpx solid #eeeeee;
-	}
-	
-	.tipsList-label:last-child {
-		border: none;
-	}
+<script>
+	export default {
+		data() {
+			return {
+				periodsPay   : [],
+				periodsIndex : 0,
+				listsArr     : [], // 结果列表
+				listsTotal   : '',
+				listsInfo    : {
+					title: '',
+					total: ''
+				}
+				
+			}
+		},
+		onLoad(options){
+			let dData       = decodeURIComponent(options.data);
+			let newdData    = JSON.parse(dData)
+			
+			this.listsInfo.title = newdData.institution
+			this.listsInfo.total = newdData.total
+			this.periodsPay      = newdData.periods
+			this.otherArr        = newdData.other
+			
+			console.log(this.periodsIndex)
+			
+			let newValue = newdData.periods[this.periodsIndex]
+			for(var item in this.otherArr){
+				if(newValue == item){
+					var tValue = this.otherArr[item];
+					this.listsArr   = tValue.data
+					this.listsTotal = tValue.total
+				} 
+			}
+		},
+		
+		created() {
+			
+		},
+		
+		methods: {
+			// 选择期数
+			periodsChange(e) {
+				this.periodsIndex = e.detail.value
+				let newValue = this.periodsPay[this.periodsIndex]
+				for(var item in this.otherArr){
+					if(newValue == item){
+						var tValue = this.otherArr[item];
+						this.listsArr   = tValue.data
+						this.listsTotal = tValue.total
+					} 
+				} 
+			},
+		}
+	}
+</script>
+
+<style>
+	.indexTop {
+		width: 100%;
+		height: 440rpx;
+	}
+	
+	.indexTips {
+		position: absolute;
+		top: 0;
+		left: 0;
+		padding: 60rpx 40rpx 0;
+		box-sizing: border-box;
+		color: #fff;
+	}
+	
+	.indexTips-name {
+		font-weight: 600;
+		font-size: 44rpx;
+	}
+	
+	.indexTips-text {
+		margin-top: 20rpx;
+		font-size: 28rpx;
+	}
+	
+	.indexCont {
+		width: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		position: absolute;
+		margin-top: 240rpx;
+		top: 0;
+		left: 0;
+	}
+	
+	.indexCont-white {
+		height: 100%;
+		background: white;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		margin-bottom: 30rpx;
+		position: relative;
+	}
+	.indexCont-white::after,
+	.indexCont-white::before {
+		position: absolute;
+		content: '';
+		background-color: rgba(255, 255, 255, .4);
+		left: 20rpx;
+		border-radius: 20rpx 20rpx 0 0;
+	}
+	.indexCont-white::after {
+		z-index: 2;
+		width: calc(100% - 40rpx);
+		left: 20rpx;
+		top: -25rpx;
+		height: 25px;
+	}
+	.indexCont-white::before {
+		z-index: 1;
+		width: calc(100% - 80rpx);
+		left: 40rpx;
+		top: -50rpx;
+		height: 50rpx;
+	}
+	
+	.item {
+		overflow: hidden;
+	}
+	
+	.item-label {
+		line-height: 48rpx;
+		padding: 15rpx 0;
+		display: flex;
+		margin-right: 20rpx;
+		font-weight: 400;
+	}
+	
+	.item-label-name {
+		color: #999999;
+	}
+	
+	.list {
+		border-top: 2rpx dotted #eeeeee;
+		margin-top: 30rpx;
+		padding-top: 10rpx;
+	}
+	
+	.list-label {
+		display: flex;
+		padding: 30rpx 0 10rpx;
+	}
+	
+	.border-top {
+		border-top: 4rpx solid #999999;
+		padding-top: 20rpx;
+		margin-top: 20rpx;
+	}
+	
+	.list-name {
+		flex: 1;
+	}
+	
+	.list-text {
+		font-weight: 600;
+	}
+	
+	.return {
+		margin-top: 50rpx;
+		margin-bottom: 30rpx;
+		width: 100%;
+		background-color: #fff;
+		border-radius: 80rpx;
+		line-height: 88rpx;
+		text-align: center;
+		color: #0c58d2;
+		border: 2rpx solid #0c58d2;
+	}
+	
+	.tipsTitle-name {
+		font-weight: 600;
+		font-size: 34rpx;
+		text-align: center;
+		margin-top: 30rpx;
+	}
+	
+	.tipsTitle-bottom {
+		text-align: right;
+		position: relative;
+		margin: 30rpx 0;
+		font-size: 28rpx;
+	}
+	
+	.tipsTitle-picker {
+		padding-right: 40rpx;
+		box-sizing: border-box;
+	}
+	
+	.tipsTitle-picker-img {
+		width: 24rpx;
+		position: absolute;
+		top: 6rpx;
+		right: 0;
+	}
+	
+	.tipsList {
+		margin: 20rpx 0;
+		font-size: 26rpx;
+		font-weight: 400;
+		border: 1px solid #eee;;
+		border-radius: 20rpx;
+	}
+	
+	.tipsList-tab {
+		display: flex;
+		background: #e5edf8;
+		line-height: 90rpx;
+		border-radius: 20rpx 20rpx 0 0;
+	}
+	
+	.tips-tab-item, .tips-label-item {
+		flex: 4;
+		text-align: center;
+	}
+	
+	.tipsList-label {
+		display: flex;
+		line-height: 80rpx;
+		background: #fafafa;
+		border-bottom: 2rpx solid #eeeeee;
+	}
+	
+	.tipsList-label:last-child {
+		border: none;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/result/result.vue b/pages/result/result.vue
index 2422771..b5c582f 100644
--- a/pages/result/result.vue
+++ b/pages/result/result.vue
@@ -1,614 +1,682 @@
-<template>
-	<view class="content">
-		<image class="indexTop" src="/static/index_top.png" mode="scaleToFill"></image>
-		<view class="indexTips">
-			<view class="indexTips-name">计算结果...</view>
-			<view class="indexTips-text">根据您填写的内容生成以下结果</view>
-		</view>
-		<view class="indexCont">
-			<view class="indexCont-white" v-for="(item, index) in listsArr" :key="index">
-				<view class="resultTitle">
-					{{item.institution}}
-				</view>
-				<view class="resultList">
-					<view class="item">
-						<view class="item-label">
-							<view class="item-label-name">
-								欠款金额：
-							</view>
-							<view class="item-label-text">
-								{{item.total}}元
-							</view>
-						</view>
-						<view :class="{textShadow: item.status != '1'}">
-							<view class="item-label">
-								<view class="item-label-name">
-									首付金额：
-								</view>
-								<view class="item-label-text">
-									{{item.base.first_amount}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									分期金额：
-								</view>
-								<view class="item-label-text">
-									{{item.base.periods_amount}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									分期期数：
-								</view>
-								<view class="item-label-text">
-									{{item.base.periods}}期
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									手续费费率：
-								</view>
-								<view class="item-label-text">
-									{{item.base.tax}}%
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									每期还款本金：
-								</view>
-								<view class="item-label-text">
-									{{item.base.every_total}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									每期还款手续费：
-								</view>
-								<view class="item-label-text">
-									{{item.base.every_tax}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									总还款金额：
-								</view>
-								<view class="item-label-text">
-									{{item.base.total}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									总还款本金：
-								</view>
-								<view class="item-label-text">
-									{{item.base.principal}}元
-								</view>
-							</view>
-							<view class="item-label">
-								<view class="item-label-name">
-									总还款手续费：
-								</view>
-								<view class="item-label-text">
-									{{item.base.tax_amount}}元
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="tips">温馨提示：{{item.description}}</view>
-					<view class="see">
-						<view class="see-go" @click="generalClick(item)" v-if="item.status == '1'">点击查看还款计划表</view>
-						<view class="see-go" @click="unlockClick(item.share)" v-else><image class="indexLock" src="/static/lock.png" mode="widthFix"></image>分享二维码，解锁次数</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<!-- 还款计划表弹出 -->
-		<view class="tipsBack" v-if="generalShow" :catchtouchmove="true"></view>
-		<view class="tipsCont" v-if="generalShow" :catchtouchmove="true">
-			<view class="tipsWhite">
-				<view class="tipsTitle">还款计划表（单位：元）</view>
-				<view class="tipsList">
-					<view class="tipsList-tab">
-						<view class="tips-tab-item">期数</view>
-						<view class="tips-tab-item">还款金额</view>
-						<view class="tips-tab-item">本金</view>
-						<view class="tips-tab-item">手续费</view>
-					</view>
-					<view class="tipsList-data">
-						<view class="tipsList-label" v-for="(items, index) in timeArr" :key="index">
-							<view class="tips-label-item">第{{index+1}}期</view>
-							<view class="tips-label-item">{{items.total}}</view>
-							<view class="tips-label-item">{{items.principal}}</view>
-							<view class="tips-label-item">{{items.tax}}</view>
-						</view>
-						<view class="tipsList-label">
-							<view class="tips-label-item">合计</view>
-							<view class="tips-label-item">{{timeAll.total}}</view>
-							<view class="tips-label-item">{{timeAll.principal}}</view>
-							<view class="tips-label-item">{{timeAll.tax}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="tipsWhite-btn">
-					<view @click="otherSee" class="tipsWhite-btn-go">
-						其他还款方式
-					</view>
-				</view>
-				<image class="close" @click="generalShow = false" src="/static/close.png" mode="widthFix"></image>
-			</view>
-		</view>
-	
-		<!-- 邀请好友弹出 -->
-		<view class="postertBack" v-if="isImgLay"></view>
-		<view class="postertCont postertContTop" v-if="isImgLay">
-			<view class="poster-back">
-				<image class="poster-img" src="/static/share_back.png" mode="widthFix"></image>
-				<view class="poster-Cont">
-				    <view class="poster-Cont-code">
-						<image :src="canShare.qrcode" mode="widthFix"></image>
-					</view>
-				    <view class="poster-Cont-url">
-						<view class="nowrap poster-url-number" @click="copyUrl(canShare.url)">地址：{{canShare.url}}/</view>
-						<view class="poster-url-copy">复制</view>
-				    </view>
-					<view class="poster-Cont-btn">
-						<view class="poster-Cont-down" @click="shareClick">保存图片，分享好友<image class="poster-Cont-down-img" src="/static/hand.png" mode="widthFix"></image></view>
-					</view>
-				</view>
-				<image class="sign-img-btn" src="/static/close.png" @click="isImgLay = false" mode="widthFix"></image>
-			</view>
-		</view>
-		
-		<!-- 长按保存 -->
-		<view class="postertBack" v-if="isImgLong"></view>
-		<view class="postertCont" v-if="isImgLong">
-			<view class="poster-back">
-				<image v-if="isImgLong" class="poster-img" :src="posterImg" mode="widthFix"></image>
-				<view class="poster-Cont-btn" style="margin-top: 40rpx; text-align: center;">
-					<view class="poster-Cont-down">请长按图片，保存本地</view>
-					<image class="poster-img-btn" src="/static/close.png" @click="isImgLong = false" mode="widthFix"></image>
-				</view>
-			</view>
-		</view>
-		
-		<!-- 海报canvas -->
-		<vue-canvas-poster :widthPixels="1000" :painting="paintings" @success="saveSuccess" @fail="saveFail"></vue-canvas-poster>
-		
+<template>
+	<view class="content">
+		<image class="indexTop" src="/static/index_top.png" mode="scaleToFill"></image>
+		<view class="indexTips">
+			<view class="indexTips-name">计算结果...</view>
+			<view class="indexTips-text">根据您填写的内容生成以下结果</view>
+		</view>
+		<view class="indexCont">
+			<view class="indexCont-white" v-for="(item, index) in listsArr" :key="index">
+				<view class="resultTitle">
+					{{item.institution}}
+				</view>
+				<view class="resultList">
+					<view class="item">
+						<view class="item-label">
+							<view class="item-label-name">
+								欠款金额：
+							</view>
+							<view class="item-label-text">
+								{{item.total}}元
+							</view>
+						</view>
+						<view :class="{textShadow: item.status != '1'}">
+							<view class="item-label">
+								<view class="item-label-name">
+									首付金额：
+								</view>
+								<view class="item-label-text">
+									{{item.base.first_amount}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									分期金额：
+								</view>
+								<view class="item-label-text">
+									{{item.base.periods_amount}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									分期期数：
+								</view>
+								<view class="item-label-text">
+									{{item.base.periods}}期
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									手续费费率：
+								</view>
+								<view class="item-label-text">
+									{{item.base.tax}}%
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									每期还款本金：
+								</view>
+								<view class="item-label-text">
+									{{item.base.every_total}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									每期还款手续费：
+								</view>
+								<view class="item-label-text">
+									{{item.base.every_tax}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									总还款金额：
+								</view>
+								<view class="item-label-text">
+									{{item.base.total}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									总还款本金：
+								</view>
+								<view class="item-label-text">
+									{{item.base.principal}}元
+								</view>
+							</view>
+							<view class="item-label">
+								<view class="item-label-name">
+									总还款手续费：
+								</view>
+								<view class="item-label-text">
+									{{item.base.tax_amount}}元
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="tips">温馨提示：{{item.description}}</view>
+					<view class="see">
+						<view class="see-go" @click="generalClick(item)" v-if="item.status == '1'">点击查看还款计划表</view>
+						<view class="see-go" @click="unlockClick(item.share)" v-else><image class="indexLock" src="/static/lock.png" mode="widthFix"></image>分享二维码，解锁次数</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 还款计划表弹出 -->
+		<view class="tipsBack" v-if="generalShow" :catchtouchmove="true"></view>
+		<view class="tipsCont" v-if="generalShow" :catchtouchmove="true">
+			<view class="tipsWhite">
+				<view class="tipsTitle">
+					<view class="tipsTitle-name">还款计划表（单位：元）</view>
+					<view class="tipsTitle-bottom">
+						<picker :range="periodsPay" class="tipsTitle-picker" @change="periodsChange">
+							<view class="uni-input">选择还款期数：{{periodsPay[periodsIndex]}}期</view>
+							<image src="/static/basic_down.png" class="tipsTitle-picker-img" mode="widthFix"></image>
+						</picker>
+					</view>
+				</view>
+				
+				<view class="tipsList">
+					<view class="tipsList-tab">
+						<view class="tips-tab-item">期数</view>
+						<view class="tips-tab-item">还款金额</view>
+						<view class="tips-tab-item">本金</view>
+						<view class="tips-tab-item">手续费</view>
+					</view>
+					<view class="tipsList-data">
+						<view class="tipsList-label" v-for="(items, index) in periodsArr" :key="index">
+							<view class="tips-label-item">第{{index+1}}期</view>
+							<view class="tips-label-item">{{items.total}}</view>
+							<view class="tips-label-item">{{items.principal}}</view>
+							<view class="tips-label-item">{{items.tax}}</view>
+						</view>
+						<view class="tipsList-label">
+							<view class="tips-label-item">合计</view>
+							<view class="tips-label-item">{{timeAll.total}}</view>
+							<view class="tips-label-item">{{timeAll.principal}}</view>
+							<view class="tips-label-item">{{timeAll.tax}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="tipsWhite-btn">
+					<view @click="otherSee" class="tipsWhite-btn-go">
+						其他还款方式
+					</view>
+				</view>
+				<image class="close" @click="generalShow = false" src="/static/close.png" mode="widthFix"></image>
+			</view>
+		</view>
+	
+		<!-- 邀请好友弹出 -->
+		<view class="postertBack" v-if="isImgLay"></view>
+		<view class="postertCont postertContTop" v-if="isImgLay">
+			<view class="poster-back">
+				<image class="poster-img" src="/static/share_back.png" mode="widthFix"></image>
+				<view class="poster-Cont">
+				    <view class="poster-Cont-code">
+						<image :src="canShare.qrcode" mode="widthFix"></image>
+					</view>
+				    <view class="poster-Cont-url">
+						<view class="nowrap poster-url-number" @click="copyUrl(canShare.url)">地址：{{canShare.url}}/</view>
+						<view class="poster-url-copy">复制</view>
+				    </view>
+					<view class="poster-Cont-btn">
+						<view class="poster-Cont-down" @click="shareClick">保存图片，分享好友<image class="poster-Cont-down-img" src="/static/hand.png" mode="widthFix"></image></view>
+					</view>
+				</view>
+				<image class="sign-img-btn" src="/static/close.png" @click="isImgLay = false" mode="widthFix"></image>
+			</view>
+		</view>
+		
+		<!-- 长按保存 -->
+		<view class="postertBack" v-if="isImgLong"></view>
+		<view class="postertCont" v-if="isImgLong">
+			<view class="poster-back">
+				<image v-if="isImgLong" class="poster-img" :src="posterImg" mode="widthFix"></image>
+				<view class="poster-Cont-btn" style="margin-top: 40rpx; text-align: center;">
+					<view class="poster-Cont-down">请长按图片，保存本地</view>
+					<image class="poster-img-btn" src="/static/close.png" @click="isImgLong = false" mode="widthFix"></image>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 海报canvas -->
+		<vue-canvas-poster :widthPixels="1000" :painting="paintings" @success="saveSuccess" @fail="saveFail"></vue-canvas-poster>
+		
 	</view>
 </template>
 
-<script>
-	import { Lists } from '@/apis/interfaces/index'
-	import { VueCanvasPoster } from 'vue-canvas-poster'
-	export default {
-		components: {
-		    VueCanvasPoster
-		},
-		data() {
-			return {
-				listsArr   : [], // 结果列表
-				timeArr    : [], // 还款计划表列表
-				timeAll    : '', // 还款计划表总计
-				otherArr   : '', // 其他携带数据
-				generalShow: false,
-				
-				// 海报
-				canShare   : '',    // 分享图片
-				isImgLay   : false, // 是否显示图片弹出层
-				isImgLong  : false,// 长按保存图片
-				paintings  : {
-				    width: "375px",
-				    height: "375px",
-				    borderRadius: "10px",
-				    background: "#ffffff",
-				    views: [
-				        //海报背景
-				        {
-				            type: "image",
-				            url: "/static/share_downback.png",
-				            css: {
-				                top: "0",
-				                left: "0",
-				                width: "375px",
-				                height: "375px",
-				                mode: 'aspectFill'
-				            },
-				        },
-				        
-				        //二维码
-				        {
-				            type: "image",
-				            url: "",
-				            css: {
-				                top: "60px",
-				                left: "60px",
-				                width: "255px",
-				                height: "255px",
-				                mode: 'aspectFill'
-				            },
-				        }
-				    ],
-				},
-				posterImg: "", //生成的海报图片路径
-			}
-		},
-		created() {
-			// 获取查看结果
-			this.listsInfo()
-		},
-		
-		methods: {
-			// 查看结果
-			listsInfo() {
-				Lists().then(res => {
-					this.listsArr = res
-				}).catch(err => {
-					uni.showToast({
-						title: err.message,
-						icon: "none" 
-					})
-				})
-			},
-			
-			// 查看还款计划表
-			generalClick(arr){
-				this.otherArr    = arr
-				this.timeArr     = arr.project
-				this.timeAll     = arr.project_total
-				this.generalShow = !this.generalShow
-			},
-			
-			// 其他方式
-			otherSee() {
-				let newData = JSON.stringify(this.otherArr);
-				uni.navigateTo({
-					url: `/pages/result/other?data=${encodeURIComponent(newData)}`
-				})
-				
-				this.generalShow = false
-			},
-			
-			// 显示海报
-			unlockClick(share) {
-				this.paintings.views[1].url  = share.qrcode
-				this.isImgLay  = true
-				this.canShare  = share
-			},
-			
-			// 下载海报
-			shareClick (){
-				this.isImgLay  = false
-				this.isImgLong = true
-				
-			},
-			
-			saveSuccess(src) {
-			    this.posterImg = src;
-			},
-			saveFail(err) {},
-		}
-	}
-</script>
-
-<style>
-	.indexTop {
-		width: 100%;
-		height: 440rpx;
-	}
-	
-	.indexTips {
-		position: absolute;
-		top: 0;
-		left: 0;
-		padding: 60rpx 40rpx 0;
-		box-sizing: border-box;
-		color: #fff;
-	}
-	
-	.indexTips-name {
-		font-weight: 600;
-		font-size: 44rpx;
-	}
-	
-	.indexTips-text {
-		margin-top: 20rpx;
-		font-size: 28rpx;
-	}
-	
-	.indexCont {
-		width: 100%;
-		padding: 30rpx;
-		box-sizing: border-box;
-		position: absolute;
-		margin-top: 200rpx;
-		top: 0;
-		left: 0;
-	}
-	
-	.indexCont-white {
-		height: 100%;
-		background: white;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-		margin-bottom: 30rpx;
-	}
-	
-	.resultTitle {
-		font-weight: 600;
-		font-size: 34rpx;
-		color: #0c58d2;
-		margin-bottom: 20rpx;
-	}
-	
-	.item-label {
-		line-height: 48rpx;
-		padding: 15rpx 0;
-		display: flex;
-		margin-right: 20rpx;
-		font-weight: 400;
-	}
-	
-	.item-label-name {
-		color: #999999;
-	}
-	
-	.textShadow {
-		filter: blur(6px);
-	}
-	
-	.tips {
-		font-weight: 400;
-		background-color: #f7faff;
-		border-radius: 10rpx;
-		padding: 20rpx 30rpx;
-		text-align: justify;
-		box-sizing: border-box;
-		font-size: 26rpx;
-		color: #999999;
-		line-height: 40rpx;
-		margin-top: 20rpx;
-	}
-	
-	.see {
-		text-align: center;
-		margin-top: 30rpx;
-	}
-	
-	.see-go {
-		display: inline-block;
-		border: 2rpx solid #0c58d2;
-		color: #0c58d2;
-		line-height: 74rpx;
-		padding: 0 25rpx;
-		border-radius: 10rpx;
-	}
-	
-	.indexLock {
-		width: 34rpx;
-		vertical-align: -4rpx;
-		margin-right: 10rpx;
-	}
-	
-	
-	/* 计划表弹出 */
-	.tipsBack {
-		position: fixed;
-		width: 100vw;
-		height: 100vh;
-		left: 0;
-		top: 0;
-		z-index: 9;
-		background-color: rgba(0, 0, 0, .6);
-	}
-	.tipsCont {
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-box-pack: center;
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		z-index: 10;
-		padding: 0 10%;
-		box-sizing: border-box;
-		text-align: center;
-	}
-	
-	.tipsWhite {
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-		position: relative;
-	}
-	
-	.close {
-		position: absolute;
-		left: calc(50% - 35rpx);
-		width: 70rpx;
-		bottom: -120rpx;
-		z-index: 999;
-	}
-	
-	.tipsTitle {
-		font-weight: 600;
-		font-size: 34rpx;
-	}
-	
-	.tipsList {
-		margin: 20rpx 0;
-		font-size: 28rpx;
-		font-weight: 400;
-	}
-	
-	.tipsList-tab {
-		display: flex;
-		background: #e5edf8;
-		line-height: 90rpx;
-		border-radius: 20rpx 20rpx 0 0;
-	}
-	
-	.tips-tab-item, .tips-label-item {
-		flex: 4;
-		text-align: center;
-	}
-	.tipsList-data {
-		background: #fafafa;
-		border-radius: 0 0 20rpx 20rpx;
-		max-height: 30vh;
-		overflow: hidden;
-		overflow-y: scroll;
-	}
-	.tipsList-label {
-		display: flex;
-		line-height: 80rpx;
-		border-bottom: 2rpx solid #eeeeee;
-	}
-	
-	.tipsList-label:last-child {
-		border: none;
-	}
-	
-	.tipsWhite-btn {
-		text-align: center;
-		padding: 30rpx 0 20rpx;
-	}
-	
-	.tipsWhite-btn-go {
-		display: inline-block;
-		width: 70%;
-		line-height: 88rpx;
-		border-radius: 80rpx;
-		background-color: #0c58d2;
-		color: #fff;
-	}
-	
-	.postertBack {
-	    width: 100vw;
-	    height: 100vh;
-	    position: fixed;
-	    background-color: rgba(0,0,0,.6);
-	    left: 0;
-	    top: 0;
-	    z-index: 999;
-	}
-	
-	.postertCont {
-		display: -webkit-box;
-		-webkit-box-orient: vertical;
-		-webkit-box-pack: center;
-		position: fixed;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		z-index: 1000;
-		padding: 0 10%;
-		box-sizing: border-box;
-	}
-	
-	.postertContTop {
-		top: -200rpx;
-	}
-	
-	.poster-back {
-		position: relative;
-		padding-top: 100%;
-		width: 100%;
-	}
-	
-	.poster-img, .poster-Cont {
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		left: 0;
-		top: 0;
-	}
-	
-	.poster-Cont {
-		padding: 50rpx;
-		box-sizing: border-box;
-		color: #fff;
-	}
-	
-	.poster-Cont-code {
-		background: #fff;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-	}
-	
-	.poster-Cont-code image {
-		width: 100%;
-	}
-	
-	.poster-Cont-url {
-		display: flex;
-		padding: 30rpx 0 40rpx;
-	}
-	
-	.poster-url-number {
-		flex: 1;
-		padding-right: 20rpx;
-		box-sizing: border-box;
-	}
-	
-	.poster-url-copy {
-		font-weight: 600;
-	}
-	
-	.poster-Cont-btn {
-		text-align: center;
-	}
-	
-	.poster-Cont-down {
-		display: inline-block;
-		width: 80%;
-		background-color: #fff;
-		border-radius: 80rpx;
-		line-height: 90rpx;
-		color: #051437;
-		font-weight: 600;
-	}
-	
-	.poster-Cont-down-img {
-		width: 40rpx;
-		margin-left: 15rpx;
-		vertical-align: -8rpx;
-		animation: bounce-down 2s linear infinite;
-	}
-	
-	
-	@keyframes bounce-down {
-	    25% {
-	        transform: translateX(-4px);
-	    }
-	
-	    50%,
-	    100% {
-	        transform: translateX(0);
-	    }
-	
-	    75% {
-	        transform: translateX(4px);
-	    }
-	}
-	
-	.sign-img-btn {
-		position: absolute;
-		left: calc(50% - 35rpx);
-		width: 70rpx;
-		top: calc(100% + 240rpx);
-		z-index: 999;
-	}
-	
-	.poster-img-btn {
-		width: 70rpx;
-		display: block;
-		margin: 30rpx auto 0;
-	}
+<script>
+	import { Lists } from '@/apis/interfaces/index'
+	import { VueCanvasPoster } from 'vue-canvas-poster'
+	export default {
+		components: {
+		    VueCanvasPoster
+		},
+		data() {
+			return {
+				listsArr   : [], // 结果列表
+				timeArr    : [], // 还款计划表列表
+				timeAll    : '', // 还款计划表总计
+				otherArr   : '', // 其他携带数据
+				generalShow: false,
+				paySuccess : true,
+				periodsPay : [],
+				periodsArr : [],
+				periodsIndex: 0,
+				
+				// 海报
+				canShare   : '',    // 分享图片
+				isImgLay   : false, // 是否显示图片弹出层
+				isImgLong  : false,// 长按保存图片
+				paintings  : {
+				    width: "375px",
+				    height: "375px",
+				    borderRadius: "10px",
+				    background: "#ffffff",
+				    views: [
+				        //海报背景
+				        {
+				            type: "image",
+				            url: "/static/share_downback.png",
+				            css: {
+				                top: "0",
+				                left: "0",
+				                width: "375px",
+				                height: "375px",
+				                mode: 'aspectFill'
+				            },
+				        },
+				        
+				        //二维码
+				        {
+				            type: "image",
+				            url: "",
+				            css: {
+				                top: "50px",
+				                left: "60px",
+				                width: "255px",
+				                height: "255px",
+				                mode: 'aspectFill'
+				            },
+				        },
+				        
+				        // 文本一
+				        {
+				            type: "text",
+				            text: '盘债计算器',
+				            css: {
+				                top: "300px",
+				                left: "134px",
+				        		width: "375px",
+				                fontSize: "20px",
+				                color: "#000000"
+				            },
+				        },
+				    ],
+				},
+				posterImg: "", //生成的海报图片路径
+			}
+		},
+		created() {
+			// 获取查看结果
+			this.listsInfo()
+		},
+		
+		methods: {
+			// 查看结果
+			listsInfo() {
+				Lists().then(res => {
+					this.listsArr = res
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: "none" 
+					})
+				})
+			},
+			
+			generalClick(arr){
+				this.otherArr    = arr
+				this.timeArr     = arr.project
+				this.periodsPay  = arr.periods
+				this.generalShow = !this.generalShow
+				
+				// 还款计划表
+				let newValue = arr.periods[this.periodsIndex]
+				for(var item in arr.project){
+					if(newValue == item){
+						var jValue = arr.project[item];
+						this.periodsArr = jValue.data
+						this.timeAll    = jValue.total
+					} 
+				}
+			},
+			
+			// 其他方式
+			otherSee() {
+				let newData = JSON.stringify(this.otherArr);
+				uni.navigateTo({
+					url: `/pages/result/other?data=${encodeURIComponent(newData)}`
+				})
+				
+				this.generalShow = false
+			},
+			
+			
+			// 显示海报
+			unlockClick(share) {
+				this.paintings.views[1].url  = share.qrcode
+				this.isImgLay  = true
+				this.canShare  = share
+			},
+			
+			// 选择期数
+			periodsChange(e) {
+				this.periodsIndex = e.detail.value
+				let newValue = this.periodsPay[this.periodsIndex]
+				for(var item in this.timeArr){
+					if(newValue == item){
+						var jValue = this.timeArr[item];
+						this.periodsArr = jValue.data
+						this.timeAll    = jValue.total
+					} 
+				} 
+			},
+			
+			// 下载海报
+			shareClick (){
+				this.isImgLay  = false
+				this.isImgLong = true
+				
+			},
+			
+			saveSuccess(src) {
+			    this.posterImg = src;
+			},
+			saveFail(err) {},
+		}
+	}
+</script>
+
+<style>
+	.indexTop {
+		width: 100%;
+		height: 440rpx;
+	}
+	
+	.indexTips {
+		position: absolute;
+		top: 0;
+		left: 0;
+		padding: 60rpx 40rpx 0;
+		box-sizing: border-box;
+		color: #fff;
+	}
+	
+	.indexTips-name {
+		font-weight: 600;
+		font-size: 44rpx;
+	}
+	
+	.indexTips-text {
+		margin-top: 20rpx;
+		font-size: 28rpx;
+	}
+	
+	.indexCont {
+		width: 100%;
+		padding: 30rpx;
+		box-sizing: border-box;
+		position: absolute;
+		margin-top: 200rpx;
+		top: 0;
+		left: 0;
+	}
+	
+	.indexCont-white {
+		height: 100%;
+		background: white;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		margin-bottom: 30rpx;
+	}
+	
+	.resultTitle {
+		font-weight: 600;
+		font-size: 34rpx;
+		color: #0c58d2;
+		margin-bottom: 20rpx;
+	}
+	
+	.item-label {
+		line-height: 48rpx;
+		padding: 15rpx 0;
+		display: flex;
+		margin-right: 20rpx;
+		font-weight: 400;
+	}
+	
+	.item-label-name {
+		color: #999999;
+	}
+	
+	.textShadow {
+		filter: blur(6px);
+	}
+	
+	.tips {
+		font-weight: 400;
+		background-color: #f7faff;
+		border-radius: 10rpx;
+		padding: 20rpx 30rpx;
+		text-align: justify;
+		box-sizing: border-box;
+		font-size: 26rpx;
+		color: #999999;
+		line-height: 40rpx;
+		margin-top: 20rpx;
+	}
+	
+	.see {
+		text-align: center;
+		margin-top: 30rpx;
+	}
+	
+	.see-go {
+		display: inline-block;
+		border: 2rpx solid #0c58d2;
+		color: #0c58d2;
+		line-height: 74rpx;
+		padding: 0 25rpx;
+		border-radius: 10rpx;
+	}
+	
+	.indexLock {
+		width: 34rpx;
+		vertical-align: -4rpx;
+		margin-right: 10rpx;
+	}
+	
+	
+	/* 计划表弹出 */
+	.tipsBack {
+		position: fixed;
+		width: 100vw;
+		height: 100vh;
+		left: 0;
+		top: 0;
+		z-index: 9;
+		background-color: rgba(0, 0, 0, .6);
+	}
+	.tipsCont {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-box-pack: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 10;
+		padding: 0 10%;
+		box-sizing: border-box;
+		text-align: center;
+	}
+	
+	.tipsWhite {
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		position: relative;
+	}
+	
+	.close {
+		position: absolute;
+		left: calc(50% - 35rpx);
+		width: 70rpx;
+		bottom: -120rpx;
+		z-index: 999;
+	}
+	
+	.tipsTitle-name {
+		font-weight: 600;
+		font-size: 34rpx;
+	}
+	
+	.tipsTitle-bottom {
+		text-align: right;
+		position: relative;
+		margin: 30rpx 0;
+		font-size: 28rpx;
+	}
+	
+	.tipsTitle-picker {
+		padding-right: 40rpx;
+		box-sizing: border-box;
+	}
+	
+	.tipsTitle-picker-img {
+		width: 24rpx;
+		position: absolute;
+		top: 6rpx;
+		right: 0;
+	}
+	
+	.tipsList {
+		margin: 20rpx 0;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+	
+	.tipsList-tab {
+		display: flex;
+		background: #e5edf8;
+		line-height: 90rpx;
+		border-radius: 20rpx 20rpx 0 0;
+	}
+	
+	.tips-tab-item, .tips-label-item {
+		flex: 4;
+		text-align: center;
+	}
+	.tipsList-data {
+		background: #fafafa;
+		border-radius: 0 0 20rpx 20rpx;
+		max-height: 30vh;
+		overflow: hidden;
+		overflow-y: scroll;
+	}
+	.tipsList-label {
+		display: flex;
+		line-height: 80rpx;
+		border-bottom: 2rpx solid #eeeeee;
+	}
+	
+	.tipsList-label:last-child {
+		border: none;
+	}
+	
+	.tipsWhite-btn {
+		text-align: center;
+		padding: 30rpx 0 20rpx;
+	}
+	
+	.tipsWhite-btn-go {
+		display: inline-block;
+		width: 70%;
+		line-height: 88rpx;
+		border-radius: 80rpx;
+		background-color: #0c58d2;
+		color: #fff;
+	}
+	
+	.postertBack {
+	    width: 100vw;
+	    height: 100vh;
+	    position: fixed;
+	    background-color: rgba(0,0,0,.6);
+	    left: 0;
+	    top: 0;
+	    z-index: 999;
+	}
+	
+	.postertCont {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-box-pack: center;
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 1000;
+		padding: 0 10%;
+		box-sizing: border-box;
+	}
+	
+	.postertContTop {
+		top: -200rpx;
+	}
+	
+	.poster-back {
+		position: relative;
+		padding-top: 100%;
+		width: 100%;
+	}
+	
+	.poster-img, .poster-Cont {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+	
+	.poster-Cont {
+		padding: 50rpx;
+		box-sizing: border-box;
+		color: #fff;
+	}
+	
+	.poster-Cont-code {
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+	
+	.poster-Cont-code image {
+		width: 100%;
+	}
+	
+	.poster-Cont-url {
+		display: flex;
+		padding: 30rpx 0 40rpx;
+	}
+	
+	.poster-url-number {
+		flex: 1;
+		padding-right: 20rpx;
+		box-sizing: border-box;
+	}
+	
+	.poster-url-copy {
+		font-weight: 600;
+	}
+	
+	.poster-Cont-btn {
+		text-align: center;
+	}
+	
+	.poster-Cont-down {
+		display: inline-block;
+		width: 80%;
+		background-color: #fff;
+		border-radius: 80rpx;
+		line-height: 90rpx;
+		color: #051437;
+		font-weight: 600;
+	}
+	
+	.poster-Cont-down-img {
+		width: 40rpx;
+		margin-left: 15rpx;
+		vertical-align: -8rpx;
+		animation: bounce-down 2s linear infinite;
+	}
+	
+	
+	@keyframes bounce-down {
+	    25% {
+	        transform: translateX(-4px);
+	    }
+	
+	    50%,
+	    100% {
+	        transform: translateX(0);
+	    }
+	
+	    75% {
+	        transform: translateX(4px);
+	    }
+	}
+	
+	.sign-img-btn {
+		position: absolute;
+		left: calc(50% - 35rpx);
+		width: 70rpx;
+		top: calc(100% + 240rpx);
+		z-index: 999;
+	}
+	
+	.poster-img-btn {
+		width: 70rpx;
+		display: block;
+		margin: 30rpx auto 0;
+	}
 </style>
\ No newline at end of file
diff --git a/scss/globa.scss b/scss/globa.scss
new file mode 100644
index 0000000..97e36b1
--- /dev/null
+++ b/scss/globa.scss
@@ -0,0 +1,81 @@
+
+/**
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+// 文字颜色
+$text-color: #4d4d4d;
+$text-gray: #9d9d9d;
+
+// 主色调
+$mian-color: #da2b56;
+$yellow-color: #ec7647;
+
+// 辅助色
+$assist-color-1: #5dc791;
+$assist-color-2: #f2b25b;
+$assist-color-3: #ec6555;
+
+// 边框颜色
+$border-color: #f2f2f2;
+$border-color-light: #f7f8fa;
+
+// 文字尺寸变量
+$title-size: 32rpx;
+$title-size-lg: 30rpx;
+$title-size-m: 28rpx;
+$title-size-sm: 26rpx;
+
+// 模块圆角
+$radius: 20rpx;
+$radius-sm: 10rpx;
+$radius-lg: 12rpx;
+$radius-m: 10rpx;
+
+// 模块边距
+$margin: 30rpx;
+$padding: 30rpx;
+
+// ios安全距离
+.ios-bottom{
+	padding-bottom: env(safe-area-inset-bottom);
+	padding-bottom: constant(safe-area-inset-bottom);
+}
+
+.ios-left{
+	padding-left: env(safe-area-inset-left);
+	padding-left: constant(safe-area-inset-left);
+}
+
+.ios-right{
+	padding-right: env(safe-area-inset-right);
+	padding-right: constant(safe-area-inset-right);
+}
+
+.ios-top{
+	padding-top: var(--status-bar-height);
+}
+
+// 公共样式
+.vertical {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-box-pack: center;
+}
+
+.nowrap {
+    max-width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.ellipsis{
+	max-width: 100%;
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
diff --git a/uni.scss b/uni.scss
index a05adb4..d15f6ca 100644
--- a/uni.scss
+++ b/uni.scss
@@ -1,43 +1,47 @@
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-
-/* 颜色变量 */
-
-/* 行为相关颜色 */
-$uni-color-primary: #007aff;
-$uni-color-success: #4cd964;
-$uni-color-warning: #f0ad4e;
-$uni-color-error: #dd524d;
-
-/* 文字基本颜色 */
-$uni-text-color:#333;//基本色
-$uni-text-color-inverse:#fff;//反色
-$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
-$uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
-
-/* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
-
-/* 边框颜色 */
-$uni-border-color:#c8c7cc;
-
-/* 尺寸变量 */
-
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 引入自定义的scss */
+@import 'scss/globa.scss';
+
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color:#333;//基本色
+$uni-text-color-inverse:#fff;//反色
+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable:#c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color:#ffffff;
+$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color:#c8c7cc;
+
+/* 尺寸变量 */
+
 /* 文字尺寸 */
 $uni-font-size-sm:12px;
 $uni-font-size-base:14px;
diff --git a/uni_modules/oct-mechanism-picker/changelog.md b/uni_modules/oct-mechanism-picker/changelog.md
new file mode 100644
index 0000000..e69de29
diff --git a/uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue b/uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue
new file mode 100644
index 0000000..ba0b0b3
--- /dev/null
+++ b/uni_modules/oct-mechanism-picker/components/oct-mechanism-picker/oct-mechanism-picker.vue
@@ -0,0 +1,178 @@
+<template>
+	<view>
+		<uni-popup ref="octMechanismPicker">
+			<view class="mechanism--content">
+				<view class="mechanism--title" v-if="title != null">{{title}}</view>
+				<view class="mechanism--input">
+					<input type="text" placeholder="输入关键字筛选" v-model="searchValue" @input="onSearch($event)">
+					<view class="mechanism--clear" @click="onClear" v-if="searchValue.length > 0">
+						<uni-icons type="clear" size="20" color="#c3c3c3"></uni-icons>
+					</view>
+				</view>
+				<scroll-view class="mechanism--scroll" scroll-y show-scrollbar>
+					<block v-if="searchValue.length > 0">
+						<view class="mechanism--item" v-for="(item, index) in searchArr" :key="index" v-if="searchArr.length > 0" @click="onChoose(item, index)">
+							<view class="mechanism--text">{{item.title}}</view>
+							<uni-icons type="right" size="20" color="#c3c3c3"></uni-icons>
+						</view>
+						<view class="mechanism--null" v-if="searchArr.length <= 0">
+							<view>暂无与<text>[{{searchValue}}]</text>相关的搜索结果</view>
+						</view>
+					</block>
+					<block v-else>
+						<view class="mechanism--item" v-for="(item, index) in columns" :key="index" @click="onChoose(item, index)">
+							<view class="mechanism--text">{{item.title}}</view>
+							<uni-icons type="right" size="20" color="#c3c3c3"></uni-icons>
+						</view>
+					</block>
+				</scroll-view>
+				<button class="mechanism--button" @click="clear">取消</button>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+<script>
+	export default{
+		data(){
+			return{
+				searchValue: '',
+				searchArr  : []
+			}
+		},
+		props	: {
+			// 弹出层标题
+			title	: {
+				type	: String,
+				default	: null
+			},
+			// 默认值
+			value	: {
+				type	: Number,
+				default	: 0
+			},
+			// 选项
+			columns	: {
+				type	: Array,
+				default	: () => {
+					return []
+				}
+			}
+		},
+		methods	: {
+			// 弹出层
+			open(type){
+				this.$refs.octMechanismPicker.open(type || 'bottom')
+			},
+			// 关闭弹出层
+			clear(){
+				this.$refs.octMechanismPicker.close()
+				this.onClear()
+			},
+			// 选择选项
+			onChoose(val, index){
+				this.$emit('choose', {val, index})
+				this.clear()
+			},
+			// 筛选输入框
+			onSearch(e){
+				let { value }	= e.target
+				let columns		= this.columns
+				let searchArr	= []
+				for(let obj of columns){
+					if(obj.title.includes(value)){
+						searchArr.push(obj)
+					}
+				}
+				this.searchArr = searchArr
+			},
+			// 清理搜索内容
+			onClear(){
+				this.searchValue = ''
+				this.searchArr	 = []
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.mechanism--content{
+		background: white;
+		border-radius: 20rpx 20rpx 0 0;
+		overflow: hidden;
+		position: relative;
+		.mechanism--title{
+			text-align: center;
+			position: relative;
+			padding: 30rpx 50rpx;
+			font-size: 34rpx;
+			font-weight: bold;
+			&::after {
+				content: "";
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				width: 100%;
+				height: 1rpx;
+				background-image: linear-gradient(0deg, $border-color 50%, transparent 50%);
+			}
+		}
+		.mechanism--input{
+			padding: 30rpx 50rpx;
+			position: relative;
+			& > input{
+				background: #f8f8f8;
+				padding: 0 30rpx;
+				height: 80rpx;
+				border-radius: 10rpx;
+				font-size: 30rpx;
+			}
+			.mechanism--clear{
+				position: absolute;
+				top: 30rpx;
+				right: 50rpx;
+				height: 80rpx;
+				width: 80rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+		.mechanism--scroll{
+			padding: 0 50rpx;
+			box-sizing: border-box;
+			height: 50vh;
+			.mechanism--item{
+				line-height: 90rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.mechanism--text{
+					width: 80%;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+			}
+			.mechanism--null{
+				height: 40vh;
+				line-height: 40vh;
+				font-size: 30rpx;
+				color: gray;
+				text-align: center;
+				text{
+					color: #446EFE;
+				}
+			}
+		}
+		.mechanism--button{
+			margin: 30rpx 50rpx;
+			background: #446EFE;
+			color: white;
+			font-size: 34rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			padding: 0;
+			border-radius: 10rpx;
+			&::after{ display: none; }
+		}
+	}
+</style>
diff --git a/uni_modules/oct-mechanism-picker/package.json b/uni_modules/oct-mechanism-picker/package.json
new file mode 100644
index 0000000..610cb64
--- /dev/null
+++ b/uni_modules/oct-mechanism-picker/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "oct-mechanism-picker",
+  "displayName": "oct-mechanism-picker",
+  "version": "1.0.0",
+  "description": "oct-mechanism-picker",
+  "keywords": [
+    "oct-mechanism-picker"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "",
+      "data": "",
+      "permissions": ""
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "u",
+          "vue3": "u"
+        },
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/oct-mechanism-picker/readme.md b/uni_modules/oct-mechanism-picker/readme.md
new file mode 100644
index 0000000..cfa15d6
--- /dev/null
+++ b/uni_modules/oct-mechanism-picker/readme.md
@@ -0,0 +1 @@
+# oct-mechanism-picker
\ No newline at end of file
diff --git a/uni_modules/uni-data-picker/changelog.md b/uni_modules/uni-data-picker/changelog.md
new file mode 100644
index 0000000..1fb27cd
--- /dev/null
+++ b/uni_modules/uni-data-picker/changelog.md
@@ -0,0 +1,68 @@
+## 1.0.9（2022-11-30）
+- 修复 v-for 为使用 key 值控制台 warning
+## 1.0.8（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 1.0.7（2022-07-06）
+- 优化 pc端图标位置不正确的问题
+## 1.0.6（2022-07-05）
+- 优化 显示样式
+## 1.0.5（2022-07-04）
+- 修复 uni-data-picker 在 uni-forms-item 中宽度不正确的bug
+## 1.0.4（2022-04-19）
+- 修复 字节小程序 本地数据无法选择下一级的Bug
+## 1.0.3（2022-02-25）
+- 修复 nvue 不支持的 v-show 的 bug
+## 1.0.2（2022-02-25）
+- 修复 条件编译 nvue 不支持的 css 样式
+## 1.0.1（2021-11-23）
+- 修复 由上个版本引发的map、v-model等属性不生效的bug
+## 1.0.0（2021-11-19）
+- 优化 组件 UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-data-picker](https://uniapp.dcloud.io/component/uniui/uni-data-picker)
+## 0.4.9（2021-10-28）
+- 修复 VUE2 v-model 概率无效的 bug
+## 0.4.8（2021-10-27）
+- 修复 v-model 概率无效的 bug
+## 0.4.7（2021-10-25）
+- 新增 属性 spaceInfo 服务空间配置 HBuilderX 3.2.11+
+- 修复 树型 uniCloud 数据类型为 int 时报错的 bug
+## 0.4.6（2021-10-19）
+- 修复 非 VUE3 v-model 为 0 时无法选中的 bug
+## 0.4.5（2021-09-26）
+- 新增 清除已选项的功能（通过 clearIcon 属性配置是否显示按钮），同时提供 clear 方法以供调用，二者等效
+- 修复 readonly 为 true 时报错的 bug
+## 0.4.4（2021-09-26）
+- 修复 上一版本造成的 map 属性失效的 bug
+- 新增 ellipsis 属性，支持配置 tab 选项长度过长时是否自动省略
+## 0.4.3（2021-09-24）
+- 修复 某些情况下级联未触发的 bug
+## 0.4.2（2021-09-23）
+- 新增 提供 show 和 hide 方法，开发者可以通过 ref 调用
+- 新增 选项内容过长自动添加省略号
+## 0.4.1（2021-09-15）
+- 新增 map 属性 字段映射，将 text/value 映射到数据中的其他字段
+## 0.4.0（2021-07-13）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 0.3.5（2021-06-04）
+- 修复 无法加载云端数据的问题
+## 0.3.4（2021-05-28）
+- 修复 v-model 无效问题
+- 修复 loaddata 为空数据组时加载时间过长问题
+- 修复 上个版本引出的本地数据无法选择带有 children 的 2 级节点
+## 0.3.3（2021-05-12）
+- 新增 组件示例地址
+## 0.3.2（2021-04-22）
+- 修复 非树形数据有 where 属性查询报错的问题
+## 0.3.1（2021-04-15）
+- 修复 本地数据概率无法回显时问题
+## 0.3.0（2021-04-07）
+- 新增 支持云端非树形表结构数据
+- 修复 根节点 parent_field 字段等于 null 时选择界面错乱问题
+## 0.2.0（2021-03-15）
+- 修复 nodeclick、popupopened、popupclosed 事件无法触发的问题
+## 0.1.9（2021-03-09）
+- 修复 微信小程序某些情况下无法选择的问题
+## 0.1.8（2021-02-05）
+- 优化 部分样式在 nvue 上的兼容表现
+## 0.1.7（2021-02-05）
+- 调整为 uni_modules 目录规范
diff --git a/uni_modules/uni-data-picker/components/uni-data-picker/keypress.js b/uni_modules/uni-data-picker/components/uni-data-picker/keypress.js
new file mode 100644
index 0000000..a747b9f
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/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-data-picker/components/uni-data-picker/uni-data-picker.vue b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
new file mode 100644
index 0000000..489d911
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue
@@ -0,0 +1,554 @@
+<template>
+	<view class="uni-data-tree">
+		<view class="uni-data-tree-input" @click="handleInput">
+			<slot :options="options" :data="inputSelected" :error="errorMessage">
+				<view class="input-value" :class="{'input-value-border': border}" style="margin-top: 8rpx; font-size: 15px;padding: 0;">
+					<text v-if="errorMessage" class="selected-area error-text">{{errorMessage}}</text>
+					<view v-else-if="loading && !isOpened" class="selected-area">
+						<uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
+					</view>
+					<scroll-view v-else-if="inputSelected.length" class="selected-area" scroll-x="true">
+						<view class="selected-list">
+							<view class="selected-item" v-for="(item,index) in inputSelected" :key="index">
+								<text class="text-color">{{item.text}}</text><text v-if="index<inputSelected.length-1"
+									class="input-split-line">{{split}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<text v-else class="selected-area placeholder">{{placeholder}}</text>
+					<!-- <view v-if="clearIcon && !readonly && inputSelected.length" class="icon-clear"
+						@click.stop="clear">
+						<uni-icons type="clear" color="#c0c4cc" size="24"></uni-icons>
+					</view> -->
+					<view class="arrow-area" v-if="(!clearIcon || !inputSelected.length) && !readonly ">
+						<view class="input-arrow"></view>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view class="uni-data-tree-cover" v-if="isOpened" @click="handleClose"></view>
+		<view class="uni-data-tree-dialog" v-if="isOpened">
+			<view class="uni-popper__arrow"></view>
+			<view class="dialog-caption">
+				<view class="title-area">
+					<text class="dialog-title">{{popupTitle}}</text>
+				</view>
+				<view class="dialog-close" @click="handleClose">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</view>
+			<data-picker-view class="picker-view" ref="pickerView" v-model="dataValue" :localdata="localdata"
+				:preload="preload" :collection="collection" :field="field" :orderby="orderby" :where="where"
+				:step-searh="stepSearh" :self-field="selfField" :parent-field="parentField" :managed-mode="true"
+				:map="map" :ellipsis="ellipsis" @change="onchange" @datachange="ondatachange" @nodeclick="onnodeclick">
+			</data-picker-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dataPicker from "../uni-data-pickerview/uni-data-picker.js"
+	import DataPickerView from "../uni-data-pickerview/uni-data-pickerview.vue"
+
+	/**
+	 * DataPicker 级联选择
+	 * @description 支持单列、和多列级联选择。列数没有限制，如果屏幕显示不全，顶部tab区域会左右滚动。
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3796
+	 * @property {String} popup-title 弹出窗口标题
+	 * @property {Array} localdata 本地数据，参考
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} readonly = [true|false] 是否仅读
+	 * @property {Boolean} preload = [true|false] 是否预加载数据
+	 * @value true 开启预加载数据，点击弹出窗口后显示已加载数据
+	 * @value false 关闭预加载数据，点击弹出窗口后开始加载数据
+	 * @property {Boolean} step-searh = [true|false] 是否分布查询
+	 * @value true 启用分布查询，仅查询当前选中节点
+	 * @value false 关闭分布查询，一次查询出所有数据
+	 * @property {String|DBFieldString} self-field 分布查询当前字段名称
+	 * @property {String|DBFieldString} parent-field 分布查询父字段名称
+	 * @property {String|DBCollectionString} collection 表名
+	 * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+	 * @property {String} orderby 排序字段及正序倒叙设置
+	 * @property {String|JQLString} where 查询条件
+	 * @event {Function} popupshow 弹出的选择窗口打开时触发此事件
+	 * @event {Function} popuphide 弹出的选择窗口关闭时触发此事件
+	 */
+	export default {
+		name: 'UniDataPicker',
+		emits: ['popupopened', 'popupclosed', 'nodeclick', 'input', 'change', 'update:modelValue'],
+		mixins: [dataPicker],
+		components: {
+			DataPickerView
+		},
+		props: {
+			options: {
+				type: [Object, Array],
+				default () {
+					return {}
+				}
+			},
+			popupTitle: {
+				type: String,
+				default: '请选择'
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			heightMobile: {
+				type: String,
+				default: ''
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			},
+			clearIcon: {
+				type: Boolean,
+				default: true
+			},
+			border: {
+				type: Boolean,
+				default: true
+			},
+			split: {
+				type: String,
+				default: '/'
+			},
+			ellipsis: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				isOpened: false,
+				inputSelected: []
+			}
+		},
+		created() {
+			this.form = this.getForm('uniForms')
+			this.formItem = this.getForm('uniFormsItem')
+			if (this.formItem) {
+				if (this.formItem.name) {
+					this.rename = this.formItem.name
+					this.form.inputChildrens.push(this)
+				}
+			}
+
+			this.$nextTick(() => {
+				this.load()
+			})
+		},
+		methods: {
+			clear() {
+				this.inputSelected.splice(0)
+				this._dispatchEvent([])
+			},
+			onPropsChange() {
+				this._treeData = []
+				this.selectedIndex = 0
+				this.load()
+			},
+			load() {
+				if (this.readonly) {
+					this._processReadonly(this.localdata, this.dataValue)
+					return
+				}
+
+				if (this.isLocaldata) {
+					this.loadData()
+					this.inputSelected = this.selected.slice(0)
+				} else if (!this.parentField && !this.selfField && this.hasValue) {
+					this.getNodeData(() => {
+						this.inputSelected = this.selected.slice(0)
+					})
+				} else if (this.hasValue) {
+					this.getTreePath(() => {
+						this.inputSelected = this.selected.slice(0)
+					})
+				}
+			},
+			getForm(name = 'uniForms') {
+				let parent = this.$parent;
+				let parentName = parent.$options.name;
+				while (parentName !== name) {
+					parent = parent.$parent;
+					if (!parent) return false;
+					parentName = parent.$options.name;
+				}
+				return parent;
+			},
+			show() {
+				this.isOpened = true
+				setTimeout(() => {
+					this.$refs.pickerView.updateData({
+						treeData: this._treeData,
+						selected: this.selected,
+						selectedIndex: this.selectedIndex
+					})
+				}, 200)
+				this.$emit('popupopened')
+			},
+			hide() {
+				this.isOpened = false
+				this.$emit('popupclosed')
+			},
+			handleInput() {
+				if (this.readonly) {
+					return
+				}
+				this.show()
+			},
+			handleClose(e) {
+				this.hide()
+			},
+			onnodeclick(e) {
+				this.$emit('nodeclick', e)
+			},
+			ondatachange(e) {
+				this._treeData = this.$refs.pickerView._treeData
+			},
+			onchange(e) {
+				this.hide()
+				this.$nextTick(() => {
+					this.inputSelected = e;
+				})
+				this._dispatchEvent(e)
+			},
+			_processReadonly(dataList, value) {
+				var isTree = dataList.findIndex((item) => {
+					return item.children
+				})
+				if (isTree > -1) {
+					let inputValue
+					if (Array.isArray(value)) {
+						inputValue = value[value.length - 1]
+						if (typeof inputValue === 'object' && inputValue.value) {
+							inputValue = inputValue.value
+						}
+					} else {
+						inputValue = value
+					}
+					this.inputSelected = this._findNodePath(inputValue, this.localdata)
+					return
+				}
+
+				if (!this.hasValue) {
+					this.inputSelected = []
+					return
+				}
+
+				let result = []
+				for (let i = 0; i < value.length; i++) {
+					var val = value[i]
+					var item = dataList.find((v) => {
+						return v.value == val
+					})
+					if (item) {
+						result.push(item)
+					}
+				}
+				if (result.length) {
+					this.inputSelected = result
+				}
+			},
+			_filterForArray(data, valueArray) {
+				var result = []
+				for (let i = 0; i < valueArray.length; i++) {
+					var value = valueArray[i]
+					var found = data.find((item) => {
+						return item.value == value
+					})
+					if (found) {
+						result.push(found)
+					}
+				}
+				return result
+			},
+			_dispatchEvent(selected) {
+				let item = {}
+				if (selected.length) {
+					var value = new Array(selected.length)
+					for (var i = 0; i < selected.length; i++) {
+						value[i] = selected[i].value
+					}
+					item = selected[selected.length - 1]
+				} else {
+					item.value = ''
+				}
+				if (this.formItem) {
+					this.formItem.setValue(item.value)
+				}
+
+				this.$emit('input', item.value)
+				this.$emit('update:modelValue', item.value)
+				this.$emit('change', {
+					detail: {
+						value: selected
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style >
+	.uni-data-tree {
+		flex: 1;
+		position: relative;
+		font-size: 14px;
+	}
+
+	.error-text {
+		color: #DD524D;
+	}
+
+	.input-value {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		flex-wrap: nowrap;
+		font-size: 14px;
+		/* line-height: 35px; */
+		padding: 0 10px;
+		padding-right: 5px;
+		overflow: hidden;
+		height: 35px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	.input-value-border {
+		border: 1px solid #e5e5e5;
+		border-radius: 5px;
+	}
+
+	.selected-area {
+		flex: 1;
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.load-more {
+		/* #ifndef APP-NVUE */
+		margin-right: auto;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 40px;
+		/* #endif */
+	}
+
+	.selected-list {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		/* padding: 0 5px; */
+	}
+
+	.selected-item {
+		flex-direction: row;
+		/* padding: 0 1px; */
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		/* #endif */
+	}
+	
+	.text-color {
+		color: #333;
+	}
+
+	.placeholder {
+		color: grey;
+		font-size: 15px;
+	}
+
+	.input-split-line {
+		opacity: .5;
+	}
+
+	.arrow-area {
+		position: relative;
+		width: 20px;
+		/* #ifndef APP-NVUE */
+		margin-bottom: 5px;
+		margin-left: auto;
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		transform: rotate(-45deg);
+		transform-origin: center;
+	}
+
+	.input-arrow {
+		width: 7px;
+		height: 7px;
+		border-left: 1px solid #999;
+		border-bottom: 1px solid #999;
+	}
+
+	.uni-data-tree-cover {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .4);
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		z-index: 100;
+	}
+
+	.uni-data-tree-dialog {
+		position: fixed;
+		left: 0;
+		top: 20%;
+		right: 0;
+		bottom: 0;
+		background-color: #FFFFFF;
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		z-index: 102;
+		overflow: hidden;
+		/* #ifdef APP-NVUE */
+		width: 750rpx;
+		/* #endif */
+	}
+
+	.dialog-caption {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		/* border-bottom: 1px solid #f0f0f0; */
+	}
+
+	.title-area {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+		/* #ifndef APP-NVUE */
+		margin: auto;
+		/* #endif */
+		padding: 0 10px;
+	}
+
+	.dialog-title {
+		/* font-weight: bold; */
+		line-height: 44px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 15px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #666;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.picker-view {
+		flex: 1;
+		overflow: hidden;
+	}
+	
+	.icon-clear {
+		display: flex;
+		align-items: center;
+	}
+
+	/* #ifdef H5 */
+	@media all and (min-width: 768px) {
+		.uni-data-tree-cover {
+			background-color: transparent;
+		}
+
+		.uni-data-tree-dialog {
+			position: absolute;
+			top: 55px;
+			height: auto;
+			min-height: 400px;
+			max-height: 50vh;
+			background-color: #fff;
+			border: 1px solid #EBEEF5;
+			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+			border-radius: 4px;
+			overflow: unset;
+		}
+
+		.dialog-caption {
+			display: none;
+		}
+
+		.icon-clear {
+			/* margin-right: 5px; */
+		}
+	}
+
+	/* #endif */
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	/* #ifndef APP-NVUE */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+	/* #endif */
+	</style>
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
new file mode 100644
index 0000000..555d2c5
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-picker.js
@@ -0,0 +1,563 @@
+export default {
+  props: {
+    localdata: {
+      type: [Array, Object],
+      default () {
+        return []
+      }
+    },
+    spaceInfo: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    collection: {
+      type: String,
+      default: ''
+    },
+    action: {
+      type: String,
+      default: ''
+    },
+    field: {
+      type: String,
+      default: ''
+    },
+    orderby: {
+      type: String,
+      default: ''
+    },
+    where: {
+      type: [String, Object],
+      default: ''
+    },
+    pageData: {
+      type: String,
+      default: 'add'
+    },
+    pageCurrent: {
+      type: Number,
+      default: 1
+    },
+    pageSize: {
+      type: Number,
+      default: 20
+    },
+    getcount: {
+      type: [Boolean, String],
+      default: false
+    },
+    getone: {
+      type: [Boolean, String],
+      default: false
+    },
+    gettree: {
+      type: [Boolean, String],
+      default: false
+    },
+    manual: {
+      type: Boolean,
+      default: false
+    },
+    value: {
+      type: [Array, String, Number],
+      default () {
+        return []
+      }
+    },
+    modelValue: {
+      type: [Array, String, Number],
+      default () {
+        return []
+      }
+    },
+    preload: {
+      type: Boolean,
+      default: false
+    },
+    stepSearh: {
+      type: Boolean,
+      default: true
+    },
+    selfField: {
+      type: String,
+      default: ''
+    },
+    parentField: {
+      type: String,
+      default: ''
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    map: {
+      type: Object,
+      default() {
+        return {
+          text: "text",
+          value: "value"
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      errorMessage: '',
+      loadMore: {
+        contentdown: '',
+        contentrefresh: '',
+        contentnomore: ''
+      },
+      dataList: [],
+      selected: [],
+      selectedIndex: 0,
+      page: {
+        current: this.pageCurrent,
+        size: this.pageSize,
+        count: 0
+      }
+    }
+  },
+  computed: {
+    isLocaldata() {
+      return !this.collection.length
+    },
+    postField() {
+      let fields = [this.field];
+      if (this.parentField) {
+        fields.push(`${this.parentField} as parent_value`);
+      }
+      return fields.join(',');
+    },
+    dataValue() {
+      let isModelValue = Array.isArray(this.modelValue) ? (this.modelValue.length > 0) : (this.modelValue !== null || this.modelValue !== undefined)
+      return isModelValue ? this.modelValue : this.value
+    },
+    hasValue() {
+      if (typeof this.dataValue === 'number') {
+        return true
+      }
+      return (this.dataValue != null) && (this.dataValue.length > 0)
+    }
+  },
+  created() {
+    this.$watch(() => {
+      var al = [];
+      ['pageCurrent',
+        'pageSize',
+        'spaceInfo',
+        'value',
+        'modelValue',
+        'localdata',
+        'collection',
+        'action',
+        'field',
+        'orderby',
+        'where',
+        'getont',
+        'getcount',
+        'gettree'
+      ].forEach(key => {
+        al.push(this[key])
+      });
+      return al
+    }, (newValue, oldValue) => {
+      let needReset = false
+      for (let i = 2; i < newValue.length; i++) {
+        if (newValue[i] != oldValue[i]) {
+          needReset = true
+          break
+        }
+      }
+      if (newValue[0] != oldValue[0]) {
+        this.page.current = this.pageCurrent
+      }
+      this.page.size = this.pageSize
+
+      this.onPropsChange()
+    })
+    this._treeData = []
+  },
+  methods: {
+    onPropsChange() {
+      this._treeData = []
+    },
+    getCommand(options = {}) {
+      /* eslint-disable no-undef */
+      let db = uniCloud.database(this.spaceInfo)
+
+      const action = options.action || this.action
+      if (action) {
+        db = db.action(action)
+      }
+
+      const collection = options.collection || this.collection
+      db = db.collection(collection)
+
+      const where = options.where || this.where
+      if (!(!where || !Object.keys(where).length)) {
+        db = db.where(where)
+      }
+
+      const field = options.field || this.field
+      if (field) {
+        db = db.field(field)
+      }
+
+      const orderby = options.orderby || this.orderby
+      if (orderby) {
+        db = db.orderBy(orderby)
+      }
+
+      const current = options.pageCurrent !== undefined ? options.pageCurrent : this.page.current
+      const size = options.pageSize !== undefined ? options.pageSize : this.page.size
+      const getCount = options.getcount !== undefined ? options.getcount : this.getcount
+      const getTree = options.gettree !== undefined ? options.gettree : this.gettree
+
+      const getOptions = {
+        getCount,
+        getTree
+      }
+      if (options.getTreePath) {
+        getOptions.getTreePath = options.getTreePath
+      }
+
+      db = db.skip(size * (current - 1)).limit(size).get(getOptions)
+
+      return db
+    },
+		getNodeData(callback) {
+		  if (this.loading) {
+		    return
+		  }
+		  this.loading = true
+		  this.getCommand({
+		    field: this.postField,
+				where: this._pathWhere()
+		  }).then((res) => {
+		    this.loading = false
+		    this.selected = res.result.data
+		    callback && callback()
+		  }).catch((err) => {
+		    this.loading = false
+		    this.errorMessage = err
+		  })
+		},
+    getTreePath(callback) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        getTreePath: {
+          startWith: `${this.selfField}=='${this.dataValue}'`
+        }
+      }).then((res) => {
+        this.loading = false
+        let treePath = []
+        this._extractTreePath(res.result.data, treePath)
+        this.selected = treePath
+        callback && callback()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    loadData() {
+      if (this.isLocaldata) {
+        this._processLocalData()
+        return
+      }
+
+      if (this.dataValue != null) {
+        this._loadNodeData((data) => {
+          this._treeData = data
+          this._updateBindData()
+          this._updateSelected()
+        })
+        return
+      }
+
+      if (this.stepSearh) {
+        this._loadNodeData((data) => {
+          this._treeData = data
+          this._updateBindData()
+        })
+      } else {
+        this._loadAllData((data) => {
+          this._treeData = []
+          this._extractTree(data, this._treeData, null)
+          this._updateBindData()
+        })
+      }
+    },
+    _loadAllData(callback) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        gettree: true,
+        startwith: `${this.selfField}=='${this.dataValue}'`
+      }).then((res) => {
+        this.loading = false
+        callback(res.result.data)
+        this.onDataChange()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    _loadNodeData(callback, pw) {
+      if (this.loading) {
+        return
+      }
+      this.loading = true
+
+      this.getCommand({
+        field: this.postField,
+        where: pw || this._postWhere(),
+        pageSize: 500
+      }).then((res) => {
+        this.loading = false
+        callback(res.result.data)
+        this.onDataChange()
+      }).catch((err) => {
+        this.loading = false
+        this.errorMessage = err
+      })
+    },
+    _pathWhere() {
+      let result = []
+      let where_field = this._getParentNameByField();
+      if (where_field) {
+        result.push(`${where_field} == '${this.dataValue}'`)
+      }
+
+      if (this.where) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
+    _postWhere() {
+      let result = []
+      let selected = this.selected
+      let parentField = this.parentField
+      if (parentField) {
+        result.push(`${parentField} == null || ${parentField} == ""`)
+      }
+      if (selected.length) {
+        for (var i = 0; i < selected.length - 1; i++) {
+          result.push(`${parentField} == '${selected[i].value}'`)
+        }
+      }
+
+      let where = []
+      if (this.where) {
+        where.push(`(${this.where})`)
+      }
+      if (result.length) {
+        where.push(`(${result.join(' || ')})`)
+      }
+
+      return where.join(' && ')
+    },
+    _nodeWhere() {
+      let result = []
+      let selected = this.selected
+      if (selected.length) {
+        result.push(`${this.parentField} == '${selected[selected.length - 1].value}'`)
+      }
+
+      if (this.where) {
+        return `(${this.where}) && (${result.join(' || ')})`
+      }
+
+      return result.join(' || ')
+    },
+    _getParentNameByField() {
+      const fields = this.field.split(',');
+      let where_field = null;
+      for (let i = 0; i < fields.length; i++) {
+        const items = fields[i].split('as');
+        if (items.length < 2) {
+          continue;
+        }
+        if (items[1].trim() === 'value') {
+          where_field = items[0].trim();
+          break;
+        }
+      }
+      return where_field
+    },
+    _isTreeView() {
+      return (this.parentField && this.selfField)
+    },
+    _updateSelected() {
+      var dl = this.dataList
+      var sl = this.selected
+      let textField = this.map.text
+      let valueField = this.map.value
+      for (var i = 0; i < sl.length; i++) {
+        var value = sl[i].value
+        var dl2 = dl[i]
+        for (var j = 0; j < dl2.length; j++) {
+          var item2 = dl2[j]
+          if (item2[valueField] === value) {
+            sl[i].text = item2[textField]
+            break
+          }
+        }
+      }
+    },
+    _updateBindData(node) {
+      const {
+        dataList,
+        hasNodes
+      } = this._filterData(this._treeData, this.selected)
+
+      let isleaf = this._stepSearh === false && !hasNodes
+
+      if (node) {
+        node.isleaf = isleaf
+      }
+
+      this.dataList = dataList
+      this.selectedIndex = dataList.length - 1
+
+      if (!isleaf && this.selected.length < dataList.length) {
+        this.selected.push({
+          value: null,
+          text: "请选择"
+        })
+      }
+
+      return {
+        isleaf,
+        hasNodes
+      }
+    },
+    _filterData(data, paths) {
+      let dataList = []
+      let hasNodes = true
+
+      dataList.push(data.filter((item) => {
+        return (item.parent_value === null || item.parent_value === undefined || item.parent_value === '')
+      }))
+      for (let i = 0; i < paths.length; i++) {
+        var value = paths[i].value
+        var nodes = data.filter((item) => {
+          return item.parent_value === value
+        })
+
+        if (nodes.length) {
+          dataList.push(nodes)
+        } else {
+          hasNodes = false
+        }
+      }
+
+      return {
+        dataList,
+        hasNodes
+      }
+    },
+    _extractTree(nodes, result, parent_value) {
+      let list = result || []
+      let valueField = this.map.value
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+
+        let child = {}
+        for (let key in node) {
+          if (key !== 'children') {
+            child[key] = node[key]
+          }
+        }
+        if (parent_value !== null && parent_value !== undefined && parent_value !== '') {
+          child.parent_value = parent_value
+        }
+        result.push(child)
+
+        let children = node.children
+        if (children) {
+          this._extractTree(children, result, node[valueField])
+        }
+      }
+    },
+    _extractTreePath(nodes, result) {
+      let list = result || []
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+
+        let child = {}
+        for (let key in node) {
+          if (key !== 'children') {
+            child[key] = node[key]
+          }
+        }
+        result.push(child)
+
+        let children = node.children
+        if (children) {
+          this._extractTreePath(children, result)
+        }
+      }
+    },
+    _findNodePath(key, nodes, path = []) {
+      let textField = this.map.text
+      let valueField = this.map.value
+      for (let i = 0; i < nodes.length; i++) {
+        let node = nodes[i]
+        let children = node.children
+        let text = node[textField]
+        let value = node[valueField]
+
+        path.push({
+          value,
+          text
+        })
+
+        if (value === key) {
+          return path
+        }
+
+        if (children) {
+          const p = this._findNodePath(key, children, path)
+          if (p.length) {
+            return p
+          }
+        }
+
+        path.pop()
+      }
+      return []
+    },
+    _processLocalData() {
+      this._treeData = []
+      this._extractTree(this.localdata, this._treeData)
+
+      var inputValue = this.dataValue
+      if (inputValue === undefined) {
+        return
+      }
+
+      if (Array.isArray(inputValue)) {
+        inputValue = inputValue[inputValue.length - 1]
+        if (typeof inputValue === 'object' && inputValue[this.map.value]) {
+          inputValue = inputValue[this.map.value]
+        }
+      }
+
+      this.selected = this._findNodePath(inputValue, this.localdata)
+    }
+  }
+}
diff --git a/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
new file mode 100644
index 0000000..0990868
--- /dev/null
+++ b/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.vue
@@ -0,0 +1,335 @@
+<template>
+	<view class="uni-data-pickerview">
+		<scroll-view class="selected-area" scroll-x="true" scroll-y="false" :show-scrollbar="false">
+			<view class="selected-list">
+				<template v-for="(item,index) in selected">
+					<view class="selected-item"
+						:class="{'selected-item-active':index==selectedIndex, 'selected-item-text-overflow': ellipsis}"
+						 v-if="item.text" @click="handleSelect(index)">
+						<text class="">{{item.text}}</text>
+					</view>
+				</template>
+			</view>
+		</scroll-view>
+		<view class="tab-c">
+			<template v-for="(child, i) in dataList" >
+				<scroll-view class="list" :key="i" v-if="i==selectedIndex" :scroll-y="true">
+					<view class="item" :class="{'is-disabled': !!item.disable}" v-for="(item, j) in child" :key="j"
+						@click="handleNodeClick(item, i, j)">
+						<text class="item-text item-text-overflow">{{item[map.text]}}</text>
+						<view class="check" v-if="selected.length > i && item[map.value] == selected[i].value"></view>
+					</view>
+				</scroll-view>
+			</template>
+
+			<view class="loading-cover" v-if="loading">
+				<uni-load-more class="load-more" :contentText="loadMore" status="loading"></uni-load-more>
+			</view>
+			<view class="error-message" v-if="errorMessage">
+				<text class="error-text">{{errorMessage}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import dataPicker from "./uni-data-picker.js"
+
+	/**
+	 * DataPickerview
+	 * @description uni-data-pickerview
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3796
+	 * @property {Array} localdata 本地数据，参考
+	 * @property {Boolean} step-searh = [true|false] 是否分布查询
+	 * @value true 启用分布查询，仅查询当前选中节点
+	 * @value false 关闭分布查询，一次查询出所有数据
+	 * @property {String|DBFieldString} self-field 分布查询当前字段名称
+	 * @property {String|DBFieldString} parent-field 分布查询父字段名称
+	 * @property {String|DBCollectionString} collection 表名
+	 * @property {String|DBFieldString} field 查询字段，多个字段用 `,` 分割
+	 * @property {String} orderby 排序字段及正序倒叙设置
+	 * @property {String|JQLString} where 查询条件
+	 */
+	export default {
+		name: 'UniDataPickerView',
+		emits: ['nodeclick', 'change', 'datachange', 'update:modelValue'],
+		mixins: [dataPicker],
+		props: {
+			managedMode: {
+				type: Boolean,
+				default: false
+			},
+			ellipsis: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			if (this.managedMode) {
+				return
+			}
+
+			this.$nextTick(() => {
+				this.load()
+			})
+		},
+		methods: {
+			onPropsChange() {
+				this._treeData = []
+				this.selectedIndex = 0
+				this.load()
+			},
+			load() {
+				if (this.isLocaldata) {
+					this.loadData()
+				} else if (this.dataValue.length) {
+					this.getTreePath((res) => {
+						this.loadData()
+					})
+				}
+			},
+			handleSelect(index) {
+				this.selectedIndex = index
+			},
+			handleNodeClick(item, i, j) {
+				if (item.disable) {
+					return
+				}
+				const node = this.dataList[i][j]
+				const text = node[this.map.text]
+				const value = node[this.map.value]
+				if (i < this.selected.length - 1) {
+					this.selected.splice(i, this.selected.length - i)
+					this.selected.push({
+						text,
+						value
+					})
+				} else if (i === this.selected.length - 1) {
+					this.selected.splice(i, 1, {
+						text,
+						value
+					})
+				}
+
+				if (node.isleaf) {
+					this.onSelectedChange(node, node.isleaf)
+					return
+				}
+
+				const {
+					isleaf,
+					hasNodes
+				} = this._updateBindData()
+
+				if (!this._isTreeView() && !hasNodes) {
+					this.onSelectedChange(node, true)
+					return
+				}
+
+				if (this.isLocaldata && (!hasNodes || isleaf)) {
+					this.onSelectedChange(node, true)
+					return
+				}
+
+				if (!isleaf && !hasNodes) {
+					this._loadNodeData((data) => {
+						if (!data.length) {
+							node.isleaf = true
+						} else {
+							this._treeData.push(...data)
+							this._updateBindData(node)
+						}
+						this.onSelectedChange(node, node.isleaf)
+					}, this._nodeWhere())
+					return
+				}
+
+				this.onSelectedChange(node, false)
+			},
+			updateData(data) {
+				this._treeData = data.treeData
+				this.selected = data.selected
+				if (!this._treeData.length) {
+					this.loadData()
+				} else {
+					//this.selected = data.selected
+					this._updateBindData()
+				}
+			},
+			onDataChange() {
+				this.$emit('datachange')
+			},
+			onSelectedChange(node, isleaf) {
+				if (isleaf) {
+					this._dispatchEvent()
+				}
+
+				if (node) {
+					this.$emit('nodeclick', node)
+				}
+			},
+			_dispatchEvent() {
+				this.$emit('change', this.selected.slice(0))
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-data-pickerview {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		overflow: hidden;
+		height: 100%;
+	}
+
+	.error-text {
+		color: #DD524D;
+	}
+
+	.loading-cover {
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(255, 255, 255, .5);
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		z-index: 1001;
+	}
+
+	.load-more {
+		/* #ifndef APP-NVUE */
+		margin: auto;
+		/* #endif */
+	}
+
+	.error-message {
+		background-color: #fff;
+		position: absolute;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		padding: 15px;
+		opacity: .9;
+		z-index: 102;
+	}
+
+	/* #ifdef APP-NVUE */
+	.selected-area {
+		width: 750rpx;
+	}
+
+	/* #endif */
+
+	.selected-list {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		padding: 0 5px;
+		border-bottom: 1px solid #f8f8f8;
+	}
+
+	.selected-item {
+		margin-left: 10px;
+		margin-right: 10px;
+		padding: 12px 0;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		/* #endif */
+	}
+
+	.selected-item-text-overflow {
+		width: 168px;
+		/* fix nvue */
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		width: 6em;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		/* #endif */
+	}
+
+	.selected-item-active {
+		border-bottom: 2px solid $uni-primary;
+	}
+
+	.selected-item-text {
+		color: $uni-primary;
+	}
+
+	.tab-c {
+		position: relative;
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		overflow: hidden;
+	}
+
+	.list {
+		flex: 1;
+	}
+
+	.item {
+		padding: 12px 15px;
+		/* border-bottom: 1px solid #f0f0f0; */
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.is-disabled {
+		opacity: .5;
+	}
+
+	.item-text {
+		/* flex: 1; */
+		color: #333333;
+	}
+
+	.item-text-overflow {
+		width: 280px;
+		/* fix nvue */
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		width: 20em;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		/* #endif */
+	}
+
+	.check {
+		margin-right: 5px;
+		border: 2px solid $uni-primary;
+		border-left: 0;
+		border-top: 0;
+		height: 12px;
+		width: 6px;
+		transform-origin: center;
+		/* #ifndef APP-NVUE */
+		transition: all 0.3s;
+		/* #endif */
+		transform: rotate(45deg);
+	}
+</style>
diff --git a/uni_modules/uni-data-picker/package.json b/uni_modules/uni-data-picker/package.json
new file mode 100644
index 0000000..3724c68
--- /dev/null
+++ b/uni_modules/uni-data-picker/package.json
@@ -0,0 +1,90 @@
+{
+  "id": "uni-data-picker",
+  "displayName": "uni-data-picker 数据驱动的picker选择器",
+  "version": "1.0.9",
+  "description": "单列、多列级联选择器，常用于省市区城市选择、公司部门选择、多级分类等场景",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "picker",
+    "级联",
+    "省市区",
+    ""
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-load-more",
+			"uni-icons",
+			"uni-scss"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "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",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-data-picker/readme.md b/uni_modules/uni-data-picker/readme.md
new file mode 100644
index 0000000..a6bf10f
--- /dev/null
+++ b/uni_modules/uni-data-picker/readme.md
@@ -0,0 +1,22 @@
+## DataPicker 级联选择
+> **组件名：uni-data-picker**
+> 代码块： `uDataPicker`
+> 关联组件：`uni-data-pickerview`、`uni-load-more`。
+
+
+`<uni-data-picker>` 是一个选择类[datacom组件](https://uniapp.dcloud.net.cn/component/datacom)。
+
+支持单列、和多列级联选择。列数没有限制，如果屏幕显示不全，顶部tab区域会左右滚动。
+
+候选数据支持一次性加载完毕，也支持懒加载，比如示例图中，选择了“北京”后，动态加载北京的区县数据。
+
+`<uni-data-picker>` 组件尤其适用于地址选择、分类选择等选择类。
+
+`<uni-data-picker>` 支持本地数据、云端静态数据(json)，uniCloud云数据库数据。
+
+`<uni-data-picker>` 可以通过JQL直连uniCloud云数据库，配套[DB Schema](https://uniapp.dcloud.net.cn/uniCloud/schema)，可在schema2code中自动生成前端页面，还支持服务器端校验。
+
+在uniCloud数据表中新建表“uni-id-address”和“opendb-city-china”，这2个表的schema自带foreignKey关联。在“uni-id-address”表的表结构页面使用schema2code生成前端页面，会自动生成地址管理的维护页面，自动从“opendb-city-china”表包含的中国所有省市区信息里选择地址。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
new file mode 100644
index 0000000..6449885
--- /dev/null
+++ b/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,22 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 1.3.0（2021-11-19）
+- 新增 更多图标
+- 优化 自定义图标使用方式
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-icons/components/uni-icons/icons.js b/uni_modules/uni-icons/components/uni-icons/icons.js
new file mode 100644
index 0000000..7889936
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -0,0 +1,1169 @@
+export default {
+  "id": "2852637",
+  "name": "uniui图标库",
+  "font_family": "uniicons",
+  "css_prefix_text": "uniui-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "25027049",
+      "name": "yanse",
+      "font_class": "color",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "25027048",
+      "name": "wallet",
+      "font_class": "wallet",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
+      "icon_id": "25015720",
+      "name": "settings-filled",
+      "font_class": "settings-filled",
+      "unicode": "e6ce",
+      "unicode_decimal": 59086
+    },
+    {
+      "icon_id": "25015434",
+      "name": "shimingrenzheng-filled",
+      "font_class": "auth-filled",
+      "unicode": "e6cc",
+      "unicode_decimal": 59084
+    },
+    {
+      "icon_id": "24934246",
+      "name": "shop-filled",
+      "font_class": "shop-filled",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "24934159",
+      "name": "staff-filled-01",
+      "font_class": "staff-filled",
+      "unicode": "e6cb",
+      "unicode_decimal": 59083
+    },
+    {
+      "icon_id": "24932461",
+      "name": "VIP-filled",
+      "font_class": "vip-filled",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
+    },
+    {
+      "icon_id": "24932462",
+      "name": "plus_circle_fill",
+      "font_class": "plus-filled",
+      "unicode": "e6c7",
+      "unicode_decimal": 59079
+    },
+    {
+      "icon_id": "24932463",
+      "name": "folder_add-filled",
+      "font_class": "folder-add-filled",
+      "unicode": "e6c8",
+      "unicode_decimal": 59080
+    },
+    {
+      "icon_id": "24932464",
+      "name": "yanse-filled",
+      "font_class": "color-filled",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "24932465",
+      "name": "tune-filled",
+      "font_class": "tune-filled",
+      "unicode": "e6ca",
+      "unicode_decimal": 59082
+    },
+    {
+      "icon_id": "24932455",
+      "name": "a-rilidaka-filled",
+      "font_class": "calendar-filled",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "24932456",
+      "name": "notification-filled",
+      "font_class": "notification-filled",
+      "unicode": "e6c1",
+      "unicode_decimal": 59073
+    },
+    {
+      "icon_id": "24932457",
+      "name": "wallet-filled",
+      "font_class": "wallet-filled",
+      "unicode": "e6c2",
+      "unicode_decimal": 59074
+    },
+    {
+      "icon_id": "24932458",
+      "name": "paihangbang-filled",
+      "font_class": "medal-filled",
+      "unicode": "e6c3",
+      "unicode_decimal": 59075
+    },
+    {
+      "icon_id": "24932459",
+      "name": "gift-filled",
+      "font_class": "gift-filled",
+      "unicode": "e6c4",
+      "unicode_decimal": 59076
+    },
+    {
+      "icon_id": "24932460",
+      "name": "fire-filled",
+      "font_class": "fire-filled",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    },
+    {
+      "icon_id": "24928001",
+      "name": "refreshempty",
+      "font_class": "refreshempty",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "24926853",
+      "name": "location-ellipse",
+      "font_class": "location-filled",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "24926735",
+      "name": "person-filled",
+      "font_class": "person-filled",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
+    },
+    {
+      "icon_id": "24926703",
+      "name": "personadd-filled",
+      "font_class": "personadd-filled",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
+    {
+      "icon_id": "24923351",
+      "name": "back",
+      "font_class": "back",
+      "unicode": "e6b9",
+      "unicode_decimal": 59065
+    },
+    {
+      "icon_id": "24923352",
+      "name": "forward",
+      "font_class": "forward",
+      "unicode": "e6ba",
+      "unicode_decimal": 59066
+    },
+    {
+      "icon_id": "24923353",
+      "name": "arrowthinright",
+      "font_class": "arrow-right",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
+    {
+      "icon_id": "24923354",
+      "name": "arrowthinleft",
+      "font_class": "arrow-left",
+      "unicode": "e6bc",
+      "unicode_decimal": 59068
+    },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
+    {
+      "icon_id": "24923355",
+      "name": "arrowthinup",
+      "font_class": "arrow-up",
+      "unicode": "e6bd",
+      "unicode_decimal": 59069
+    },
+		{
+		  "icon_id": "24923355",
+		  "name": "arrowthinup",
+		  "font_class": "arrowthinup",
+		  "unicode": "e6bd",
+		  "unicode_decimal": 59069
+		},
+    {
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrow-down",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },{
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrowthindown",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },
+    {
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "bottom",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },
+    {
+      "icon_id": "24923346",
+      "name": "arrowright",
+      "font_class": "right",
+      "unicode": "e6b5",
+      "unicode_decimal": 59061
+    },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
+    {
+      "icon_id": "24923347",
+      "name": "arrowup",
+      "font_class": "top",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
+    {
+      "icon_id": "24923348",
+      "name": "arrowleft",
+      "font_class": "left",
+      "unicode": "e6b7",
+      "unicode_decimal": 59063
+    },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
+    {
+      "icon_id": "24923334",
+      "name": "eye",
+      "font_class": "eye",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "24923335",
+      "name": "eye-filled",
+      "font_class": "eye-filled",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "24923336",
+      "name": "eye-slash",
+      "font_class": "eye-slash",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "24923337",
+      "name": "eye-slash-filled",
+      "font_class": "eye-slash-filled",
+      "unicode": "e6b4",
+      "unicode_decimal": 59060
+    },
+    {
+      "icon_id": "24923305",
+      "name": "info-filled",
+      "font_class": "info-filled",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "24923299",
+      "name": "reload-01",
+      "font_class": "reload",
+      "unicode": "e6b2",
+      "unicode_decimal": 59058
+    },
+    {
+      "icon_id": "24923195",
+      "name": "mic_slash_fill",
+      "font_class": "micoff-filled",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "24923165",
+      "name": "map-pin-ellipse",
+      "font_class": "map-pin-ellipse",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "24923166",
+      "name": "map-pin",
+      "font_class": "map-pin",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
+    },
+    {
+      "icon_id": "24923167",
+      "name": "location",
+      "font_class": "location",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "24923064",
+      "name": "starhalf",
+      "font_class": "starhalf",
+      "unicode": "e683",
+      "unicode_decimal": 59011
+    },
+    {
+      "icon_id": "24923065",
+      "name": "star",
+      "font_class": "star",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "24923066",
+      "name": "star-filled",
+      "font_class": "star-filled",
+      "unicode": "e68f",
+      "unicode_decimal": 59023
+    },
+    {
+      "icon_id": "24899646",
+      "name": "a-rilidaka",
+      "font_class": "calendar",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
+    },
+    {
+      "icon_id": "24899647",
+      "name": "fire",
+      "font_class": "fire",
+      "unicode": "e6a1",
+      "unicode_decimal": 59041
+    },
+    {
+      "icon_id": "24899648",
+      "name": "paihangbang",
+      "font_class": "medal",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
+    {
+      "icon_id": "24899649",
+      "name": "font",
+      "font_class": "font",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "24899650",
+      "name": "gift",
+      "font_class": "gift",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "24899651",
+      "name": "link",
+      "font_class": "link",
+      "unicode": "e6a5",
+      "unicode_decimal": 59045
+    },
+    {
+      "icon_id": "24899652",
+      "name": "notification",
+      "font_class": "notification",
+      "unicode": "e6a6",
+      "unicode_decimal": 59046
+    },
+    {
+      "icon_id": "24899653",
+      "name": "staff",
+      "font_class": "staff",
+      "unicode": "e6a7",
+      "unicode_decimal": 59047
+    },
+    {
+      "icon_id": "24899654",
+      "name": "VIP",
+      "font_class": "vip",
+      "unicode": "e6a8",
+      "unicode_decimal": 59048
+    },
+    {
+      "icon_id": "24899655",
+      "name": "folder_add",
+      "font_class": "folder-add",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "24899656",
+      "name": "tune",
+      "font_class": "tune",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "24899657",
+      "name": "shimingrenzheng",
+      "font_class": "auth",
+      "unicode": "e6ab",
+      "unicode_decimal": 59051
+    },
+    {
+      "icon_id": "24899565",
+      "name": "person",
+      "font_class": "person",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "24899566",
+      "name": "email-filled",
+      "font_class": "email-filled",
+      "unicode": "e69a",
+      "unicode_decimal": 59034
+    },
+    {
+      "icon_id": "24899567",
+      "name": "phone-filled",
+      "font_class": "phone-filled",
+      "unicode": "e69b",
+      "unicode_decimal": 59035
+    },
+    {
+      "icon_id": "24899568",
+      "name": "phone",
+      "font_class": "phone",
+      "unicode": "e69c",
+      "unicode_decimal": 59036
+    },
+    {
+      "icon_id": "24899570",
+      "name": "email",
+      "font_class": "email",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
+      "icon_id": "24899571",
+      "name": "personadd",
+      "font_class": "personadd",
+      "unicode": "e69f",
+      "unicode_decimal": 59039
+    },
+    {
+      "icon_id": "24899558",
+      "name": "chatboxes-filled",
+      "font_class": "chatboxes-filled",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
+    {
+      "icon_id": "24899559",
+      "name": "contact",
+      "font_class": "contact",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "24899560",
+      "name": "chatbubble-filled",
+      "font_class": "chatbubble-filled",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "24899561",
+      "name": "contact-filled",
+      "font_class": "contact-filled",
+      "unicode": "e695",
+      "unicode_decimal": 59029
+    },
+    {
+      "icon_id": "24899562",
+      "name": "chatboxes",
+      "font_class": "chatboxes",
+      "unicode": "e696",
+      "unicode_decimal": 59030
+    },
+    {
+      "icon_id": "24899563",
+      "name": "chatbubble",
+      "font_class": "chatbubble",
+      "unicode": "e697",
+      "unicode_decimal": 59031
+    },
+    {
+      "icon_id": "24881290",
+      "name": "upload-filled",
+      "font_class": "upload-filled",
+      "unicode": "e68e",
+      "unicode_decimal": 59022
+    },
+    {
+      "icon_id": "24881292",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "24881293",
+      "name": "weixin",
+      "font_class": "weixin",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "24881274",
+      "name": "compose",
+      "font_class": "compose",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "24881275",
+      "name": "qq",
+      "font_class": "qq",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "24881276",
+      "name": "download-filled",
+      "font_class": "download-filled",
+      "unicode": "e681",
+      "unicode_decimal": 59009
+    },
+    {
+      "icon_id": "24881277",
+      "name": "pengyouquan",
+      "font_class": "pyq",
+      "unicode": "e682",
+      "unicode_decimal": 59010
+    },
+    {
+      "icon_id": "24881279",
+      "name": "sound",
+      "font_class": "sound",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "24881280",
+      "name": "trash-filled",
+      "font_class": "trash-filled",
+      "unicode": "e685",
+      "unicode_decimal": 59013
+    },
+    {
+      "icon_id": "24881281",
+      "name": "sound-filled",
+      "font_class": "sound-filled",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "24881282",
+      "name": "trash",
+      "font_class": "trash",
+      "unicode": "e687",
+      "unicode_decimal": 59015
+    },
+    {
+      "icon_id": "24881284",
+      "name": "videocam-filled",
+      "font_class": "videocam-filled",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
+      "icon_id": "24881285",
+      "name": "spinner-cycle",
+      "font_class": "spinner-cycle",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "24881286",
+      "name": "weibo",
+      "font_class": "weibo",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "24881288",
+      "name": "videocam",
+      "font_class": "videocam",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "24881289",
+      "name": "download",
+      "font_class": "download",
+      "unicode": "e68d",
+      "unicode_decimal": 59021
+    },
+    {
+      "icon_id": "24879601",
+      "name": "help",
+      "font_class": "help",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "24879602",
+      "name": "navigate-filled",
+      "font_class": "navigate-filled",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "24879603",
+      "name": "plusempty",
+      "font_class": "plusempty",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "24879604",
+      "name": "smallcircle",
+      "font_class": "smallcircle",
+      "unicode": "e67c",
+      "unicode_decimal": 59004
+    },
+    {
+      "icon_id": "24879605",
+      "name": "minus-filled",
+      "font_class": "minus-filled",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "24879606",
+      "name": "micoff",
+      "font_class": "micoff",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "24879588",
+      "name": "closeempty",
+      "font_class": "closeempty",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "24879589",
+      "name": "clear",
+      "font_class": "clear",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "24879590",
+      "name": "navigate",
+      "font_class": "navigate",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "24879591",
+      "name": "minus",
+      "font_class": "minus",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "24879592",
+      "name": "image",
+      "font_class": "image",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "24879593",
+      "name": "mic",
+      "font_class": "mic",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "24879594",
+      "name": "paperplane",
+      "font_class": "paperplane",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "24879595",
+      "name": "close",
+      "font_class": "close",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "24879596",
+      "name": "help-filled",
+      "font_class": "help-filled",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "24879597",
+      "name": "plus-filled",
+      "font_class": "paperplane-filled",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "24879598",
+      "name": "plus",
+      "font_class": "plus",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "24879599",
+      "name": "mic-filled",
+      "font_class": "mic-filled",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "24879600",
+      "name": "image-filled",
+      "font_class": "image-filled",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "24855900",
+      "name": "locked-filled",
+      "font_class": "locked-filled",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "24855901",
+      "name": "info",
+      "font_class": "info",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "24855903",
+      "name": "locked",
+      "font_class": "locked",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "24855884",
+      "name": "camera-filled",
+      "font_class": "camera-filled",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "24855885",
+      "name": "chat-filled",
+      "font_class": "chat-filled",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "24855886",
+      "name": "camera",
+      "font_class": "camera",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "24855887",
+      "name": "circle",
+      "font_class": "circle",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "24855888",
+      "name": "checkmarkempty",
+      "font_class": "checkmarkempty",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "24855889",
+      "name": "chat",
+      "font_class": "chat",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "24855890",
+      "name": "circle-filled",
+      "font_class": "circle-filled",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "24855891",
+      "name": "flag",
+      "font_class": "flag",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "24855892",
+      "name": "flag-filled",
+      "font_class": "flag-filled",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "24855893",
+      "name": "gear-filled",
+      "font_class": "gear-filled",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "24855894",
+      "name": "home",
+      "font_class": "home",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "24855895",
+      "name": "home-filled",
+      "font_class": "home-filled",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "24855896",
+      "name": "gear",
+      "font_class": "gear",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "24855897",
+      "name": "smallcircle-filled",
+      "font_class": "smallcircle-filled",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "24855898",
+      "name": "map-filled",
+      "font_class": "map-filled",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "24855899",
+      "name": "map",
+      "font_class": "map",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "24855825",
+      "name": "refresh-filled",
+      "font_class": "refresh-filled",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "24855826",
+      "name": "refresh",
+      "font_class": "refresh",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "24855808",
+      "name": "cloud-upload",
+      "font_class": "cloud-upload",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "24855809",
+      "name": "cloud-download-filled",
+      "font_class": "cloud-download-filled",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "24855810",
+      "name": "cloud-download",
+      "font_class": "cloud-download",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "24855811",
+      "name": "cloud-upload-filled",
+      "font_class": "cloud-upload-filled",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "24855813",
+      "name": "redo",
+      "font_class": "redo",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "24855814",
+      "name": "images-filled",
+      "font_class": "images-filled",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "24855815",
+      "name": "undo-filled",
+      "font_class": "undo-filled",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "24855816",
+      "name": "more",
+      "font_class": "more",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "24855817",
+      "name": "more-filled",
+      "font_class": "more-filled",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "24855818",
+      "name": "undo",
+      "font_class": "undo",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "24855819",
+      "name": "images",
+      "font_class": "images",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "24855821",
+      "name": "paperclip",
+      "font_class": "paperclip",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "24855822",
+      "name": "settings",
+      "font_class": "settings",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "24855823",
+      "name": "search",
+      "font_class": "search",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "24855824",
+      "name": "redo-filled",
+      "font_class": "redo-filled",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "24841702",
+      "name": "list",
+      "font_class": "list",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "24841489",
+      "name": "mail-open-filled",
+      "font_class": "mail-open-filled",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "24841491",
+      "name": "hand-thumbsdown-filled",
+      "font_class": "hand-down-filled",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "24841492",
+      "name": "hand-thumbsdown",
+      "font_class": "hand-down",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "24841493",
+      "name": "hand-thumbsup-filled",
+      "font_class": "hand-up-filled",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "24841494",
+      "name": "hand-thumbsup",
+      "font_class": "hand-up",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "24841496",
+      "name": "heart-filled",
+      "font_class": "heart-filled",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "24841498",
+      "name": "mail-open",
+      "font_class": "mail-open",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "24841488",
+      "name": "heart",
+      "font_class": "heart",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "24839963",
+      "name": "loop",
+      "font_class": "loop",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "24839866",
+      "name": "pulldown",
+      "font_class": "pulldown",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "24813798",
+      "name": "scan",
+      "font_class": "scan",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "24813786",
+      "name": "bars",
+      "font_class": "bars",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "24813788",
+      "name": "cart-filled",
+      "font_class": "cart-filled",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "24813790",
+      "name": "checkbox",
+      "font_class": "checkbox",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "24813791",
+      "name": "checkbox-filled",
+      "font_class": "checkbox-filled",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "24813794",
+      "name": "shop",
+      "font_class": "shop",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "24813795",
+      "name": "headphones",
+      "font_class": "headphones",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "24813796",
+      "name": "cart",
+      "font_class": "cart",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    }
+  ]
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..a87f68e
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,96 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import icons from './icons.js';
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
+	} 
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import iconUrl from './uniicons.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('"+iconUrl+"')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons.glyphs
+			}
+		},
+		computed:{
+			unicode(){
+				let code = this.icons.find(v=>v.font_class === this.type)
+				if(code){
+					return unescape(`%u${code.unicode}`)
+				}
+				return ''
+			},
+			iconSize(){
+				return getVal(this.size)
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf') format('truetype');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
new file mode 100644
index 0000000..2f56eab
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,663 @@
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6be";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowdown:before {
+  content: "\e6b8";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-arrowright:before {
+  content: "\e6b5";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowleft:before {
+  content: "\e6b7";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-cart-filled:before {
+  content: "\e629";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..835f33bc9411461b8b9046b3fec742e921d6ce3a
GIT binary patch
literal 35760
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

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000..d1c4e77
--- /dev/null
+++ b/uni_modules/uni-icons/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.3.5",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-icons/readme.md b/uni_modules/uni-icons/readme.md
new file mode 100644
index 0000000..86234ba
--- /dev/null
+++ b/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md
new file mode 100644
index 0000000..8f03f1d
--- /dev/null
+++ b/uni_modules/uni-load-more/changelog.md
@@ -0,0 +1,19 @@
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+## 1.2.1（2021-08-24）
+- 新增 支持国际化
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-05-12）
+- 新增 组件示例地址
+## 1.1.7（2021-03-30）
+- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
+## 1.1.6（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
new file mode 100644
index 0000000..6f45b0e
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "Pull up to show more",
+	"uni-load-more.contentrefresh": "loading...",
+	"uni-load-more.contentnomore": "No more data"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
new file mode 100644
index 0000000..fa8f0f3
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/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-load-more/components/uni-load-more/i18n/zh-Hans.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
new file mode 100644
index 0000000..3a14ca0
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentrefresh": "正在加载...",
+	"uni-load-more.contentnomore": "没有更多数据了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
new file mode 100644
index 0000000..ee99b06
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
@@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉顯示更多",
+	"uni-load-more.contentrefresh": "正在加載...",
+	"uni-load-more.contentnomore": "沒有更多數據了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
new file mode 100644
index 0000000..ededbc2
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -0,0 +1,399 @@
+<template>
+	<view class="uni-load-more" @click="onClick">
+		<!-- #ifdef APP-NVUE -->
+		<loading-indicator v-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{color: color,width:iconSize+'px',height:iconSize+'px'}" :animating="true"
+			class="uni-load-more__img uni-load-more__img--nvue"></loading-indicator>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+		<svg width="24" height="24" viewBox="25 25 50 50"
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-H5">
+			<circle cx="50" cy="50" r="20" fill="none" :style="{color:color}" :stroke-width="3"></circle>
+		</svg>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE || H5 -->
+		<view
+			v-if="!webviewHide && (iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}"
+			class="uni-load-more__img uni-load-more__img--android-MP">
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+			<view class="uni-load-more__img-icon" :style="{borderTopColor:color,borderTopWidth:iconSize/12}"></view>
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef APP-NVUE -->
+		<view v-else-if="!webviewHide && status === 'loading' && showIcon"
+			:style="{width:iconSize+'px',height:iconSize+'px'}" class="uni-load-more__img uni-load-more__img--ios-H5">
+			<image :src="imgBase64" mode="widthFix"></image>
+		</view>
+		<!-- #endif -->
+		<text v-if="showText" class="uni-load-more__text"
+			:style="{color: color}">{{ status === 'more' ? contentdownText : status === 'loading' ? contentrefreshText : contentnomoreText }}</text>
+	</view>
+</template>
+
+<script>
+	let platform
+	setTimeout(() => {
+		platform = uni.getSystemInfoSync().platform
+	}, 16)
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * LoadMore 加载更多
+	 * @description 用于列表中，做滚动加载使用，展示 loading 的各种状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=29
+	 * @property {String} status = [more|loading|noMore] loading 的状态
+	 * 	@value more loading前
+	 * 	@value loading loading中
+	 * 	@value noMore 没有更多了
+	 * @property {Number} iconSize 指定图标大小
+	 * @property {Boolean} iconSize = [true|false] 是否显示 loading 图标
+	 * @property {String} iconType = [snow|circle|auto] 指定图标样式
+	 * 	@value snow ios雪花加载样式
+	 * 	@value circle 安卓唤醒加载样式
+	 * 	@value auto 根据平台自动选择加载样式
+	 * @property {String} color 图标和文字颜色
+	 * @property {Object} contentText 各状态文字说明，值为：{contentdown: "上拉显示更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"}
+	 * @event {Function} clickLoadMore 点击加载更多时触发
+	 */
+	export default {
+		name: 'UniLoadMore',
+		emits: ['clickLoadMore'],
+		props: {
+			status: {
+				// 上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
+				type: String,
+				default: 'more'
+			},
+			showIcon: {
+				type: Boolean,
+				default: true
+			},
+			iconType: {
+				type: String,
+				default: 'auto'
+			},
+			iconSize: {
+				type: Number,
+				default: 24
+			},
+			color: {
+				type: String,
+				default: '#777777'
+			},
+			contentText: {
+				type: Object,
+				default () {
+					return {
+						contentdown: '',
+						contentrefresh: '',
+						contentnomore: ''
+					}
+				}
+			},
+			showText: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				webviewHide: false,
+				platform: platform,
+				imgBase64: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QzlBMzU3OTlEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QzlBMzU3OUFEOUM0MTFFOUI0NTZDNERBQURBQzI4RkUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDOUEzNTc5N0Q5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDOUEzNTc5OEQ5QzQxMUU5QjQ1NkM0REFBREFDMjhGRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt+ALSwAAA6CSURBVHja1FsLkFZV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'
+			}
+		},
+		computed: {
+			iconSnowWidth() {
+				return (Math.floor(this.iconSize / 24) || 1) * 2
+			},
+			contentdownText() {
+				return this.contentText.contentdown || t("uni-load-more.contentdown")
+			},
+			contentrefreshText() {
+				return this.contentText.contentrefresh || t("uni-load-more.contentrefresh")
+			},
+			contentnomoreText() {
+				return this.contentText.contentnomore || t("uni-load-more.contentnomore")
+			}
+		},
+		mounted() {
+			// #ifdef APP-PLUS
+			var pages = getCurrentPages();
+			var page = pages[pages.length - 1];
+			var currentWebview = page.$getAppWebview();
+			currentWebview.addEventListener('hide', () => {
+				this.webviewHide = true
+			})
+			currentWebview.addEventListener('show', () => {
+				this.webviewHide = false
+			})
+			// #endif
+		},
+		methods: {
+			onClick() {
+				this.$emit('clickLoadMore', {
+					detail: {
+						status: this.status,
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-load-more {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		height: 40px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-load-more__text {
+		font-size: 14px;
+		margin-left: 8px;
+	}
+
+	.uni-load-more__img {
+		width: 24px;
+		height: 24px;
+		// margin-right: 8px;
+	}
+
+	.uni-load-more__img--nvue {
+		color: #666666;
+	}
+
+	.uni-load-more__img--android,
+	.uni-load-more__img--ios {
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-load-more__img--android {
+		animation: loading-ios 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	.uni-load-more__img--ios-H5 {
+		position: relative;
+		animation: loading-ios-H5 1s 0s step-end infinite;
+	}
+
+	.uni-load-more__img--ios-H5 image {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+	}
+
+	@keyframes loading-ios-H5 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		8% {
+			transform: rotate(30deg);
+		}
+
+		16% {
+			transform: rotate(60deg);
+		}
+
+		24% {
+			transform: rotate(90deg);
+		}
+
+		32% {
+			transform: rotate(120deg);
+		}
+
+		40% {
+			transform: rotate(150deg);
+		}
+
+		48% {
+			transform: rotate(180deg);
+		}
+
+		56% {
+			transform: rotate(210deg);
+		}
+
+		64% {
+			transform: rotate(240deg);
+		}
+
+		73% {
+			transform: rotate(270deg);
+		}
+
+		82% {
+			transform: rotate(300deg);
+		}
+
+		91% {
+			transform: rotate(330deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+
+	/* #ifdef H5 */
+	.uni-load-more__img--android-H5 {
+		animation: loading-android-H5-rotate 2s linear infinite;
+		transform-origin: center center;
+	}
+
+	.uni-load-more__img--android-H5 circle {
+		display: inline-block;
+		animation: loading-android-H5-dash 1.5s ease-in-out infinite;
+		stroke: currentColor;
+		stroke-linecap: round;
+	}
+
+	@keyframes loading-android-H5-rotate {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-H5-dash {
+		0% {
+			stroke-dasharray: 1, 200;
+			stroke-dashoffset: 0;
+		}
+
+		50% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -40;
+		}
+
+		100% {
+			stroke-dasharray: 90, 150;
+			stroke-dashoffset: -120;
+		}
+	}
+
+	/* #endif */
+
+	/* #ifndef APP-NVUE || H5 */
+	.uni-load-more__img--android-MP {
+		position: relative;
+		width: 24px;
+		height: 24px;
+		transform: rotate(0deg);
+		animation: loading-ios 1s 0s ease infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon {
+		position: absolute;
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+		border: solid 2px transparent;
+		border-top: solid 2px #777777;
+		transform-origin: center;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(1) {
+		animation: loading-android-MP-1 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(2) {
+		animation: loading-android-MP-2 1s 0s linear infinite;
+	}
+
+	.uni-load-more__img--android-MP .uni-load-more__img-icon:nth-child(3) {
+		animation: loading-android-MP-3 1s 0s linear infinite;
+	}
+
+	@keyframes loading-android {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-1 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(90deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-2 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(180deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes loading-android-MP-3 {
+		0% {
+			transform: rotate(0deg);
+		}
+
+		50% {
+			transform: rotate(270deg);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-load-more/package.json b/uni_modules/uni-load-more/package.json
new file mode 100644
index 0000000..2fa6f04
--- /dev/null
+++ b/uni_modules/uni-load-more/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-load-more",
+  "displayName": "uni-load-more 加载更多",
+  "version": "1.3.3",
+  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "加载更多",
+    "load-more"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-load-more/readme.md b/uni_modules/uni-load-more/readme.md
new file mode 100644
index 0000000..54dc1fa
--- /dev/null
+++ b/uni_modules/uni-load-more/readme.md
@@ -0,0 +1,14 @@
+
+
+### LoadMore 加载更多
+> **组件名：uni-load-more**
+> 代码块： `uLoadMore`
+
+
+用于列表中，做滚动加载使用，展示 loading 的各种状态。
+
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..41abeb4
--- /dev/null
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,66 @@
+## 1.8.2（2023-02-02）
+- uni-popup-dialog 组件新增 inputType 属性
+## 1.8.1（2022-12-01）
+- 修复 nvue 下 v-show 报错
+## 1.8.0（2022-11-29）
+- 优化 主题样式
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 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..a747b9f
--- /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..9bc87fc
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,275 @@
+<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="inputType" :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">{{closeText}}</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: {
+			inputType:{
+				type: String,
+				default: 'text'
+			},
+			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
+			},
+			cancelText:{
+				type: String,
+				default: ''
+			},
+			confirmText:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				focus: false,
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || 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" >
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.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: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.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: 16px;
+		color: #333;
+	}
+
+	.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..7f27a1e
--- /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" >
+	.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..ab08656
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,187 @@
+<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" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.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..8c0f5f3
--- /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..fa8f0f3
--- /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..8e5b99f
--- /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..06ce162
--- /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..16a5818
--- /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..a37fb9f
--- /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..db90c59
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,474 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<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 = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @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
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+		},
+
+		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
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		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,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible() {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					clearTimeout(this.timer)
+					this.showPopup = false
+				}
+				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 + 'px',
+					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">
+	.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..8a17034
--- /dev/null
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,87 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.8.2",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"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": "y"
+                }
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md
new file mode 100644
index 0000000..fdad4b3
--- /dev/null
+++ b/uni_modules/uni-popup/readme.md
@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000..b863bb0
--- /dev/null
+++ b/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..1744a5f
--- /dev/null
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000..7cc0ccb
--- /dev/null
+++ b/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "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": "u"
+        },
+        "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"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-scss/readme.md b/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000..b7d1c25
--- /dev/null
+++ b/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000..ffac4fe
--- /dev/null
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000..12a11c3
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 0000000..1ededd9
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000..9a0428b
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000..3c89528
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 0000000..689afec
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000..a34d08f
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000..557d3d7
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 0000000..ac6f63e
--- /dev/null
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000..80ee62f
--- /dev/null
+++ b/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000..1c062d4
--- /dev/null
+++ b/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
new file mode 100644
index 0000000..ad489f1
--- /dev/null
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,20 @@
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 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..af47dbc
--- /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..be5e794
--- /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),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		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..379e9aa
--- /dev/null
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.1",
+  "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": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md
new file mode 100644
index 0000000..1e104fe
--- /dev/null
+++ b/uni_modules/uni-transition/readme.md
@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file