diff --git a/App.vue b/App.vue
index 07e285c..768bbd2 100644
--- a/App.vue
+++ b/App.vue
@@ -19,7 +19,7 @@
 			this.globalData.$i18n = this.$i18n
 			this.globalData.$t = str => this.$t(str)
 			initApp();
-			uniIdPageInit()
+			uniIdPageInit() 
 			
 			// #ifdef APP-PLUS
 			//checkIsAgree(); APP端暂时先用原生默认生成的。目前，自定义方式启动vue界面时，原生层已经请求了部分权限这并不符合国家的法规
diff --git a/common/appInit.js b/common/appInit.js
index b62d38c..4a0f3e0 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -47,17 +47,17 @@ export default async function() {
 			methodName, // 云对象的方法名称
 			params // 参数列表
 		}) {
-			// console.log('interceptObject',{
-			// 	objectName, // 云对象名称
-			// 	methodName, // 云对象的方法名称
-			// 	params // 参数列表
-			// });
+			console.log('interceptObject',{
+				objectName, // 云对象名称
+				methodName, // 云对象的方法名称
+				params // 参数列表
+			});
 			if(objectName == "uni-id-co" && (methodName.includes('loginBy') ||  ['login','registerUser'].includes(methodName) )){
 				console.log('执行登录相关云对象');
-				params[0].inviteCode = await new Promise((callBack) => {
+				params[0].inviteCode = await new Promise((callBack) => {					
 					uni.getClipboardData({
 						success: function(res) {
-							console.log('剪切板内容：'+res.data);
+							console.log('剪切板内容：'+JSON.stringify(res));
 							if (res.data.slice(0, 18) == 'uniInvitationCode:') {
 								let uniInvitationCode = res.data.slice(18, 38)
 								console.log('当前用户是其他用户推荐下载的,推荐者的code是：' + uniInvitationCode);
diff --git a/env.js b/env.js
new file mode 100644
index 0000000..3e966c3
--- /dev/null
+++ b/env.js
@@ -0,0 +1,33 @@
+// 参考文档: https://uniapp.dcloud.net.cn/worktile/auto/hbuilderx-extension/#envjs
+module.exports = {
+    "is-custom-runtime": false,
+    "UNI_TEST_CUSTOM_ENV": {},
+    "compile": true,
+    "h5": {
+        "options": {
+            "headless": true
+        },
+        "executablePath": ""
+    },
+    "mp-weixin": {
+        "port": 9420,
+        "account": "",
+        "args": "",
+        "cwd": "",
+        "launch": true,
+        "teardown": "disconnect",
+        "remote": false,
+        "executablePath": ""
+    },
+    "app-plus": {
+        "android": {
+            "id": "",
+            "executablePath": ""
+        },
+        "version": "",
+        "ios": {
+            "id": "",
+            "executablePath": ""
+        }
+    }
+}
diff --git a/jest.config.js b/jest.config.js
new file mode 100644
index 0000000..a54d98a
--- /dev/null
+++ b/jest.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+    testTimeout: 10000,
+    reporters: [
+        'default'
+    ],
+    watchPathIgnorePatterns: ['/node_modules/', '/dist/', '/.git/'],
+    moduleFileExtensions: ['js', 'json'],
+    rootDir: __dirname,
+    testMatch: ["<rootDir>/pages/**/*test.[jt]s?(x)"],
+    testPathIgnorePatterns: ['/node_modules/']
+}
diff --git a/pages-config/pages-all.json b/pages-config/pages-all.json
index 39620ad..240d441 100644
--- a/pages-config/pages-all.json
+++ b/pages-config/pages-all.json
@@ -1,43 +1,36 @@
 /* /// Pages-Tool: 该文件是pages-tool插件的配置文件，根据pages-config.json的配置,本文件的内容可能合并到pages.json*/
 {
-	"pages": [
-		// {
-		// 	"path": "pages/grid/login",
-		// 	"style": {
-		// 		"navigationStyle": "custom"
-		// 	}
-		// }
-		// ,
-		
-		 {
-			"path": "pages/grid/grid",
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index",
 			"style": {
-				"navigationStyle": "custom" 
-			}
-		},{
-			"path": "pages/ucenter",
-			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "主页"
 			}
 		},
 		{
-			"path": "pages/list/list",
+			"path": "pages/cal/cal",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "计算"
 			}
 		},
 		{
-			"path": "pages/list/detail",
+			"path": "pages/info/info",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "资料"
+			}
+		},
+		{
+			"path": "pages/ucenter/ucenter",
+			"style": {
+				"navigationBarTitleText": "我的"
 			}
 		}
 
 
 
-
 		// #ifdef APP-PLUS
-		,{
+		,
+		{
 			"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
 			"style": {
 				"disableScroll": true,
diff --git a/pages-config/tabBar.json b/pages-config/tabBar.json
index bd786b9..56091a0 100644
--- a/pages-config/tabBar.json
+++ b/pages-config/tabBar.json
@@ -1,4 +1,3 @@
-/* /// Pages-Tool: 该文件是pages-tool插件的配置文件，根据pages-config.json的配置,本文件的内容可能合并到pages.json*/
 {
 	"tabBar": {
 		"color": "#7A7E83",
@@ -6,23 +5,28 @@
 		"borderStyle": "black",
 		"backgroundColor": "#FFFFFF",
 		"list": [{
-				"pagePath": "pages/grid/grid",
+				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar/list.png",
 				"selectedIconPath": "static/tabbar/list_active.png",
 				"text": "首页"
+			}, {
+				"pagePath": "pages/cal/cal",
+				"iconPath": "static/tabbar/cal.png",
+				"selectedIconPath": "static/tabbar/cal_active.png",
+				"text": "计算"
+			}, {
+				"pagePath": "pages/info/info",
+				"iconPath": "static/tabbar/info.png",
+				"selectedIconPath": "static/tabbar/info_active.png",
+				"text": "资料"
 			}
-			// , {
-			// 	"pagePath": "pages/list/list",
-			// 	"iconPath": "static/tabbar/grid.png",
-			// 	"selectedIconPath": "static/tabbar/grid_active.png",
-			// 	"text": "常用资料"
-			// }
+
 			, {
-				"pagePath": "pages/ucenter",
+				"pagePath": "pages/ucenter/ucenter",
 				"iconPath": "static/tabbar/me.png",
 				"selectedIconPath": "static/tabbar/me_active.png",
 				"text": "我的"
 			}
 		]
 	}
-}
\ No newline at end of file
+}s
\ No newline at end of file
diff --git a/pages.json b/pages.json
index c8a00fd..888b49d 100644
--- a/pages.json
+++ b/pages.json
@@ -1,42 +1,35 @@
 {
-	"pages": [
-		// {
-		// 	"path": "pages/grid/login",
-		// 	"style": {
-		// 		"navigationStyle": "custom"
-		// 	}
-		// }
-		// ,
-		
-		 {
-			"path": "pages/grid/grid",
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index",
 			"style": {
-				"navigationStyle": "custom" 
-			}
-		},{
-			"path": "pages/ucenter",
-			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "主页"
 			}
 		},
 		{
-			"path": "pages/list/list",
+			"path": "pages/cal/cal",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "计算"
 			}
 		},
 		{
-			"path": "pages/list/detail",
+			"path": "pages/info/info",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "资料"
+			}
+		},
+		{
+			"path": "pages/ucenter/ucenter",
+			"style": {
+				"navigationBarTitleText": "我的"
 			}
 		}
 
 
 
-
 		// #ifdef APP-PLUS
-		,{
+		,
+		{
 			"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
 			"style": {
 				"disableScroll": true,
@@ -648,19 +641,24 @@
 		"borderStyle": "black",
 		"backgroundColor": "#FFFFFF",
 		"list": [{
-				"pagePath": "pages/grid/grid",
+				"pagePath": "pages/index/index",
 				"iconPath": "static/tabbar/list.png",
 				"selectedIconPath": "static/tabbar/list_active.png",
 				"text": "首页"
+			}, {
+				"pagePath": "pages/cal/cal",
+				"iconPath": "static/tabbar/cal.png",
+				"selectedIconPath": "static/tabbar/cal_active.png",
+				"text": "计算"
+			}, {
+				"pagePath": "pages/info/info",
+				"iconPath": "static/tabbar/info.png",
+				"selectedIconPath": "static/tabbar/info_active.png",
+				"text": "资料"
 			}
-			// , {
-			// 	"pagePath": "pages/list/list",
-			// 	"iconPath": "static/tabbar/grid.png",
-			// 	"selectedIconPath": "static/tabbar/grid_active.png",
-			// 	"text": "常用资料"
-			// }
+
 			, {
-				"pagePath": "pages/ucenter",
+				"pagePath": "pages/ucenter/ucenter",
 				"iconPath": "static/tabbar/me.png",
 				"selectedIconPath": "static/tabbar/me_active.png",
 				"text": "我的"
diff --git a/pages/cal/cal.vue b/pages/cal/cal.vue
new file mode 100644
index 0000000..cfd5ffd
--- /dev/null
+++ b/pages/cal/cal.vue
@@ -0,0 +1,370 @@
+<template>
+	<view class="warp">
+		<uni-nav-bar dark :fixed="true" shadow background-color="#007AFF" status-bar title="计算工具" />
+		<view>
+			<!-- 流量计算 -->
+			<view class="section-box">
+				<text class="decoration"></text>
+				<text class="section-text">{{ $t('llJs.grid') }}</text>
+			</view>
+
+			<view class="Grid">
+				<view class="Grid-Item" v-for="(item, index) in llJsgridList" :key="index">
+					<navigator :url="item.url">
+						<view class="GSimg">
+							<image class="Image" :src="getStaticFilePath('mianicon/' + item.icon)" mode="aspectFit"></image>
+						</view>
+						<view class="GStitle">{{ item.type }}</view>
+					</navigator>
+				</view>
+			</view>
+
+			<!-- 参数计算 -->
+			<view class="section-box">
+				<text class="decoration"></text>
+				<text class="section-text">{{ $t('wxcsJs.grid') }}</text>
+			</view>
+			<view class="Grid">
+				<view class="Grid-Item" v-for="(item, index) in wxcsJsgridList" :key="index">
+					<navigator :url="item.url">
+						<view class="GSimg">
+							<image class="Image" :src="getStaticFilePath('mianicon/' + item.icon)" mode="aspectFit"></image>
+						</view>
+						<view class="GStitle">{{ item.type }}</view>
+					</navigator>
+				</view>
+			</view>
+
+			<!-- CNG计算 -->
+			<view class="section-box">
+				<text class="decoration"></text>
+				<text class="section-text">{{ $t('CNGJs.grid') }}</text>
+			</view>
+			<view class="Grid">
+				<view class="Grid-Item" v-for="(item, index) in CNGJsgridList" :key="index">
+					<navigator :url="item.url">
+						<view class="GSimg">
+							<image class="Image" :src="getStaticFilePath('mianicon/' + item.icon)" mode="aspectFill"></image>
+						</view>
+						<view class="GStitle">{{ item.type }}</view>
+					</navigator>
+				</view>
+			</view>
+
+			<!-- <!-- CNG计算 -->
+			<view class="section-box">
+				<text class="decoration"></text>
+				<text class="section-text">{{ $t('QtJs.grid') }}</text>
+			</view>
+			<view class="Grid">
+				<view class="Grid-Item" v-for="(item, index) in QtJsgridList" :key="index">
+					<navigator :url="item.url">
+						<view class="GSimg">
+							<image class="Image" :src="getStaticFilePath('mianicon/' + item.icon)" mode="aspectFill"></image>
+						</view>
+						<view class="GStitle">{{ item.type }}</view>
+					</navigator>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+// import {
+// 	getJsonTree,
+// 	groupBy
+// } from "@/js_sdk/util/jsonData";
+import deviceinfo from '@/js_sdk/dc-deviceinfo/deviceinfo.js';
+import { saveDepartStore, saveDictItemStore } from '@/js_sdk/util/dictTools';
+
+// #ifdef APP-PLUS
+import statusBar from '@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar';
+// #endif
+const db = uniCloud.database();
+
+export default {
+	// #ifdef APP-PLUS
+	components: {
+		statusBar
+	},
+	// #endif
+	data() {
+		return {
+			llJsgridList: [],
+			wxcsJsgridList: [],
+			CNGJsgridList: [],
+			QtJsgridList: [],
+			current: 0,
+			hasLogin: false,
+			CPUNo: [],
+			msgList: []
+		};
+	},
+	onShow() {
+		this.hasLogin = uniCloud.getCurrentUserInfo().tokenExpired > Date.now();
+	},
+	mounted() {
+		//#ifdef APP
+
+		plus.device.getInfo({
+			success: function (e) {
+				console.log('getDeviceInfo success: ' + JSON.stringify(e));
+			},
+			fail: function (e) {
+				console.log('getDeviceInfo failed: ' + JSON.stringify(e));
+			}
+		});
+		// this.CPUNo=JSON.stringify(plus.device.getInfo())
+		//#endif
+
+		let that = this;
+		uni.getSystemInfo({
+			success: function (res) {
+				// console.log(res)
+			}
+		});
+	},
+	onLoad() {
+		this.getGrid();
+		saveDictItemStore();
+		saveDepartStore();
+	},
+	methods: {
+		getGrid() {
+			let gridList = [];
+			gridList.push({
+				type: this.$t('llJs.cysllJs.title'),
+				url: this.$t('llJs.cysllJs.url'),
+				icon: this.$t('llJs.cysllJs.icon')
+			});
+			gridList.push({
+				type: this.$t('llJs.sdsllJs.title'),
+				url: this.$t('llJs.sdsllJs.url'),
+				icon: this.$t('llJs.sdsllJs.icon')
+			});
+			gridList.push({
+				type: this.$t('llJs.ljlllJs.title'),
+				url: this.$t('llJs.ljlllJs.url'),
+				icon: this.$t('llJs.ljlllJs.icon')
+			});
+
+			this.llJsgridList = gridList;
+			gridList = [];
+			gridList.push({
+				type: this.$t('wxcsJs.ysyzJs.title'),
+				url: this.$t('wxcsJs.ysyzJs.url'),
+				icon: this.$t('wxcsJs.ysyzJs.icon')
+			});
+			gridList.push({
+				type: this.$t('wxcsJs.rzJs.title'),
+				url: this.$t('wxcsJs.rzJs.url'),
+				icon: this.$t('wxcsJs.rzJs.icon')
+			});
+			gridList.push({
+				type: this.$t('wxcsJs.qtJs.title'),
+				url: this.$t('wxcsJs.qtJs.url'),
+				icon: this.$t('wxcsJs.qtJs.icon')
+			});
+			this.wxcsJsgridList = gridList;
+
+			gridList = [];
+
+			gridList.push({
+				type: this.$t('CNGJs.srjJs.title'),
+				url: this.$t('CNGJs.srjJs.url'),
+				icon: this.$t('CNGJs.srjJs.icon')
+			});
+			gridList.push({
+				type: this.$t('CNGJs.zxcJs.title'),
+				url: this.$t('CNGJs.zxcJs.url'),
+				icon: this.$t('CNGJs.zxcJs.icon')
+			});
+			gridList.push({
+				type: this.$t('CNGJs.LNGQhJs.title'),
+				url: this.$t('CNGJs.LNGQhJs.url'),
+				icon: this.$t('CNGJs.LNGQhJs.icon')
+			});
+			this.CNGJsgridList = gridList;
+			gridList = [];
+
+			gridList.push({
+				type: this.$t('QtJs.ZBGJs.title'),
+				url: this.$t('QtJs.ZBGJs.url'),
+				icon: this.$t('QtJs.ZBGJs.icon')
+			});
+			gridList.push({
+				type: this.$t('QtJs.srjBGJs.title'),
+				url: this.$t('QtJs.srjBGJs.url'),
+				icon: this.$t('QtJs.srjBGJs.icon')
+			});
+			// gridList.push({
+			// 	"type": this.$t('QtJs.SqgyJs.title'),
+			// 	"url": this.$t('QtJs.SqgyJs.url')
+			// })
+			this.QtJsgridList = gridList;
+		},
+
+		/**
+		 * banner加载后触发的回调
+		 */
+		onqueryload(data) {
+			// console.log(JSON.stringify(data))
+		},
+		changeSwiper(e) {
+			this.current = e.detail.current;
+		},
+		/**
+		 * 点击banner的处理
+		 */
+		clickBannerItem(item) {
+			// 有外部链接-跳转url
+			if (item.open_url) {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/common/webview/webview?url=' + item.open_url + '&title=' + item.title,
+					success: (res) => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			}
+			// 其余业务处理
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+/* #ifndef APP-NVUE */
+page {
+	display: flex;
+	flex-direction: column;
+	box-sizing: border-box;
+	background-color: #fff;
+	min-height: 100%;
+	height: auto;
+}
+
+view {
+	font-size: 14px;
+	line-height: inherit;
+}
+
+/* #endif */
+
+.section-box {
+	display: flex;
+	flex-direction: row;
+	align-items: left;
+	padding-left: calc(10vw / 2);
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+
+.decoration {
+	width: 4px;
+	height: 12px;
+	border-radius: 10px;
+	background-color: #2979ff;
+	// margin-left: 30rpx;
+}
+
+.section-text {
+	color: blue;
+	margin-left: 10rpx;
+	font-size: 16px;
+}
+
+/* #ifdef APP-NVUE */
+.warp {
+	background-color: #fff;
+}
+
+/* #endif */
+
+.Grid {
+	width: 90vw;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	align-content: space-between;
+	padding-left: calc(10vw / 2);
+	column-gap: calc(25% / 3);
+	row-gap: 5rpx;
+	box-sizing: content-box;
+
+	.Grid-Item {
+		width: 25%;
+		height: 150rpx;
+		text-align: center;
+		border: 0rpx solid #ccc;
+		box-sizing: content-box;
+		background: #ffffff;
+		background-image: '@/static/uni-center/headers.png';
+
+		.GSimg {
+			width: 100%;
+			height: 10rpx;
+			text-align: center;
+
+			.Image {
+				width: 100rpx;
+				height: 100rpx;
+			}
+		}
+
+		.GStitle {
+			width: 100%;
+			height: 34rpx;
+			line-height: 34rpx;
+			color: orangered;
+			font-size: 26rpx;
+			padding-top: 15px;
+			margin-top: 80rpx;
+		}
+	}
+}
+
+.banner-image {
+	width: 750rpx;
+	height: 400rpx;
+}
+
+.swiper-box {
+	height: 400rpx;
+}
+
+.search-icons {
+	padding: 16rpx;
+}
+
+.search-container-bar {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	position: fixed;
+	left: 0;
+	right: 0;
+	z-index: 10;
+	background-color: #fff;
+}
+
+/* #ifndef APP-NVUE || VUE3*/
+::v-deep
+
+	/* #endif */
+	.uni-searchbar__box {
+	border-width: 0;
+}
+
+/* #ifndef APP-NVUE || VUE3 */
+::v-deep
+
+	/* #endif */
+	.uni-input-placeholder {
+	font-size: 28rpx;
+}
+</style>
diff --git a/pages/grid/grid.vue b/pages/grid/grid.vue
deleted file mode 100644
index f9de758..0000000
--- a/pages/grid/grid.vue
+++ /dev/null
@@ -1,399 +0,0 @@
-<template>
-	<view class="warp">
-		<uni-nav-bar dark :fixed="true" shadow background-color="#007AFF" status-bar title="天然气计算工具集" />
-		<view>
-
-
-
-			<!-- 流量计算 -->
-			<view class="section-box">
-				<text class="decoration"></text>
-				<text class="section-text">{{$t('llJs.grid')}}</text>
-			</view>
-
-			<view class="Grid">
-				<view class="Grid-Item" v-for="(item,index) in llJsgridList" :key="index">
-					<navigator :url="item.url">
-						<view class="GSimg">
-							<image class="Image" :src="getStaticFilePath('mianicon/'+item.icon)" mode="aspectFit">
-							</image>
-						</view>
-						<view class="GStitle">{{ item.type }}</view>
-					</navigator>
-
-				</view>
-			</view>
-
-
-
-
-			<!-- 参数计算 -->
-			<view class="section-box">
-				<text class="decoration"></text>
-				<text class="section-text">{{$t('wxcsJs.grid')}}</text>
-			</view>
-			<view class="Grid">
-				<view class="Grid-Item" v-for="(item,index) in wxcsJsgridList" :key="index">
-					<navigator :url="item.url">
-						<view class="GSimg">
-							<image class="Image" :src="getStaticFilePath('mianicon/'+item.icon)" mode="aspectFit">
-							</image>
-						</view>
-						<view class="GStitle">{{ item.type }}</view>
-					</navigator>
-				</view>
-			</view>
-
-			<!-- CNG计算 -->
-			<view class="section-box">
-				<text class="decoration"></text>
-				<text class="section-text">{{$t('CNGJs.grid')}}</text>
-			</view>
-			<view class="Grid">
-				<view class="Grid-Item" v-for="(item,index) in CNGJsgridList" :key="index">
-					<navigator :url="item.url">
-						<view class="GSimg">
-							<image class="Image" :src="getStaticFilePath('mianicon/'+item.icon)" mode="aspectFill">
-							</image>
-						</view>
-						<view class="GStitle">{{ item.type }}</view>
-					</navigator>
-				</view>
-			</view>
-
-			<!-- <!-- CNG计算 -->
-			<view class="section-box">
-				<text class="decoration"></text>
-				<text class="section-text">{{$t('QtJs.grid')}}</text>
-			</view>
-			<view class="Grid">
-				<view class="Grid-Item" v-for="(item,index) in QtJsgridList" :key="index">
-					<navigator :url="item.url">
-						<view class="GSimg">
-							<image class="Image" :src="getStaticFilePath('mianicon/'+item.icon)" mode="aspectFill">
-							</image>
-						</view>
-						<view class="GStitle">{{ item.type }}</view>
-					</navigator>
-				</view>
-			</view>
-
-
-
-		</view>
-	</view>
-</template>
-
-<script>
-	// import {
-	// 	getJsonTree,
-	// 	groupBy
-	// } from "@/js_sdk/util/jsonData";
-	import deviceinfo from '@/js_sdk/dc-deviceinfo/deviceinfo.js'
-	import {
-		saveDepartStore,
-		saveDictItemStore
-	} from '@/js_sdk/util/dictTools';
-
-	// #ifdef APP-PLUS
-	import statusBar from "@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar";
-	// #endif
-	const db = uniCloud.database();
-
-	export default {
-		// #ifdef APP-PLUS
-		components: {
-			statusBar
-		},
-		// #endif
-		data() {
-			return {
-				llJsgridList: [],
-				wxcsJsgridList: [],
-				CNGJsgridList: [],
-				QtJsgridList: [],
-				current: 0,
-				hasLogin: false,
-				CPUNo: [],
-				msgList: []
-			}
-		},
-		onShow() {
-			this.hasLogin = uniCloud.getCurrentUserInfo().tokenExpired > Date.now()
-		},
-		mounted() {
-
-			//#ifdef APP
-
-			plus.device.getInfo({
-				success: function(e) {
-					console.log('getDeviceInfo success: ' + JSON.stringify(e));
-				},
-				fail: function(e) {
-					console.log('getDeviceInfo failed: ' + JSON.stringify(e));
-				}
-			});
-			// this.CPUNo=JSON.stringify(plus.device.getInfo())
-			//#endif
-
-
-			let that = this;
-			uni.getSystemInfo({
-				success: function(res) {
-					// console.log(res)
-				}
-			});
-		},
-		onLoad() {
-
-			this.getGrid();
-			saveDictItemStore();
-			saveDepartStore();
-
-		},
-		methods: {
-
-
-			getGrid() {
-				let gridList = []
-				gridList.push({
-					"type": this.$t('llJs.cysllJs.title'),
-					"url": this.$t('llJs.cysllJs.url'),
-					"icon": this.$t('llJs.cysllJs.icon')
-				})
-				gridList.push({
-					"type": this.$t('llJs.sdsllJs.title'),
-					"url": this.$t('llJs.sdsllJs.url'),
-					"icon": this.$t('llJs.sdsllJs.icon')
-				})
-				gridList.push({
-					"type": this.$t('llJs.ljlllJs.title'),
-					"url": this.$t('llJs.ljlllJs.url'),
-					"icon": this.$t('llJs.ljlllJs.icon')
-				})
-
-				this.llJsgridList = gridList
-				gridList = []
-				gridList.push({
-					"type": this.$t('wxcsJs.ysyzJs.title'),
-					"url": this.$t('wxcsJs.ysyzJs.url'),
-					"icon": this.$t('wxcsJs.ysyzJs.icon')
-				})
-				gridList.push({
-					"type": this.$t('wxcsJs.rzJs.title'),
-					"url": this.$t('wxcsJs.rzJs.url'),
-					"icon": this.$t('wxcsJs.rzJs.icon')
-				})
-				gridList.push({
-					"type": this.$t('wxcsJs.qtJs.title'),
-					"url": this.$t('wxcsJs.qtJs.url'),
-					"icon": this.$t('wxcsJs.qtJs.icon')
-				})
-				this.wxcsJsgridList = gridList
-
-				gridList = []
-
-				gridList.push({
-					"type": this.$t('CNGJs.srjJs.title'),
-					"url": this.$t('CNGJs.srjJs.url'),
-					"icon": this.$t('CNGJs.srjJs.icon')
-				})
-				gridList.push({
-					"type": this.$t('CNGJs.zxcJs.title'),
-					"url": this.$t('CNGJs.zxcJs.url'),
-					"icon": this.$t('CNGJs.zxcJs.icon')
-				})
-				gridList.push({
-					"type": this.$t('CNGJs.LNGQhJs.title'),
-					"url": this.$t('CNGJs.LNGQhJs.url'),
-					"icon": this.$t('CNGJs.LNGQhJs.icon')
-				})
-				this.CNGJsgridList = gridList
-				gridList = []
-
-				gridList.push({
-					"type": this.$t('QtJs.ZBGJs.title'),
-					"url": this.$t('QtJs.ZBGJs.url'),
-					"icon": this.$t('QtJs.ZBGJs.icon')
-				})
-				gridList.push({
-					"type": this.$t('QtJs.srjBGJs.title'),
-					"url": this.$t('QtJs.srjBGJs.url'),
-					"icon": this.$t('QtJs.srjBGJs.icon')
-				})
-				// gridList.push({
-				// 	"type": this.$t('QtJs.SqgyJs.title'),
-				// 	"url": this.$t('QtJs.SqgyJs.url')
-				// })
-				this.QtJsgridList = gridList
-			},
-
-			/**
-			 * banner加载后触发的回调
-			 */
-			onqueryload(data) {
-				// console.log(JSON.stringify(data))
-			},
-			changeSwiper(e) {
-				this.current = e.detail.current
-			},
-			/**
-			 * 点击banner的处理
-			 */
-			clickBannerItem(item) {
-				// 有外部链接-跳转url
-				if (item.open_url) {
-					uni.navigateTo({
-						url: '/uni_modules/uni-id-pages/pages/common/webview/webview?url=' + item.open_url +
-							'&title=' + item.title,
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-				}
-				// 其余业务处理
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	/* #ifndef APP-NVUE */
-	page {
-		display: flex;
-		flex-direction: column;
-		box-sizing: border-box;
-		background-color: #fff;
-		min-height: 100%;
-		height: auto;
-	}
-
-	view {
-		font-size: 14px;
-		line-height: inherit;
-	}
-
-
-
-	/* #endif */
-
-	.section-box {
-		display: flex;
-		flex-direction: row;
-		align-items: left;
-		padding-left: calc(10vw /2);
-		padding-top: 10px;
-		padding-bottom: 10px;
-	}
-
-	.decoration {
-		width: 4px;
-		height: 12px;
-		border-radius: 10px;
-		background-color: #2979ff;
-		// margin-left: 30rpx;
-	}
-
-	.section-text {
-		color: blue;
-		margin-left: 10rpx;
-		font-size: 16px;
-	}
-
-	/* #ifdef APP-NVUE */
-	.warp {
-		background-color: #fff;
-	}
-
-	/* #endif */
-
-
-
-	.Grid {
-		width: 90vw;
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-		justify-content: flex-start;
-		align-content: space-between;
-		padding-left: calc(10vw /2);
-		column-gap: calc(25% / 3);
-		row-gap: 5rpx;
-		box-sizing: content-box;
-
-		.Grid-Item {
-			width: 25%;
-			height: 150rpx;
-			text-align: center;
-			border: 0rpx solid #ccc;
-			box-sizing: content-box;
-			background: #ffffff;
-			background-image: "@/static/uni-center/headers.png";
-
-			.GSimg {
-				width: 100%;
-				height: 10rpx;
-				text-align: center;
-
-				.Image {
-					width: 100rpx;
-					height: 100rpx;
-				}
-			}
-
-			.GStitle {
-				width: 100%;
-				height: 34rpx;
-				line-height: 34rpx;
-				color: orangered;
-				font-size: 26rpx;
-				padding-top: 15px;
-				margin-top: 80rpx;
-
-			}
-		}
-	}
-
-	.banner-image {
-		width: 750rpx;
-		height: 400rpx;
-	}
-
-	.swiper-box {
-		height: 400rpx;
-	}
-
-	.search-icons {
-		padding: 16rpx;
-	}
-
-	.search-container-bar {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		position: fixed;
-		left: 0;
-		right: 0;
-		z-index: 10;
-		background-color: #fff;
-	}
-
-	/* #ifndef APP-NVUE || VUE3*/
-	::v-deep
-
-	/* #endif */
-	.uni-searchbar__box {
-		border-width: 0;
-	}
-
-	/* #ifndef APP-NVUE || VUE3 */
-	::v-deep
-
-	/* #endif */
-	.uni-input-placeholder {
-		font-size: 28rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/grid/login.vue b/pages/grid/login.vue
deleted file mode 100644
index 629e443..0000000
--- a/pages/grid/login.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-	<view>
-
-	</view>
-</template>
-
-<script>
-	export default {
-
-		onLoad() {
-			uni.navigateTo({
-				url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
-			})
-		} 
-
-
-	}
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
new file mode 100644
index 0000000..ec0ec26
--- /dev/null
+++ b/pages/index/index.vue
@@ -0,0 +1,52 @@
+<template>
+	<view class="content">
+		<image class="logo" src="/static/logo.png"></image>
+		<view class="text-area">
+			<text class="title">{{title}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: 'Hello'
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.logo {
+		height: 200rpx;
+		width: 200rpx;
+		margin-top: 200rpx;
+		margin-left: auto;
+		margin-right: auto;
+		margin-bottom: 50rpx;
+	}
+
+	.text-area {
+		display: flex;
+		justify-content: center;
+	}
+
+	.title {
+		font-size: 36rpx;
+		color: #8f8f94;
+	}
+</style>
diff --git a/pages/info/info.vue b/pages/info/info.vue
new file mode 100644
index 0000000..96689d5
--- /dev/null
+++ b/pages/info/info.vue
@@ -0,0 +1,9 @@
+<template>
+	<view class="warp">
+		<uni-nav-bar dark :fixed="true" shadow background-color="#007AFF" status-bar title="文档资料" />
+	</view>
+</template>
+
+<script></script>
+
+<style></style>
diff --git a/pages/list/detail.vue b/pages/list/detail.vue
deleted file mode 100644
index 5bbef34..0000000
--- a/pages/list/detail.vue
+++ /dev/null
@@ -1,373 +0,0 @@
-<template>
-	<!--
-	 本页面模板教程：https://ext.dcloud.net.cn/plugin?id=2717
-	 uni-list 文档：https://ext.dcloud.net.cn/plugin?id=24
-	 uniCloud 文档：https://uniapp.dcloud.io/uniCloud/README
-	 unicloud-db 组件文档：https://uniapp.dcloud.net.cn/uniCloud/unicloud-db-component
-	 DB Schema 规范：https://uniapp.dcloud.net.cn/uniCloud/schema
-	 -->
-	<view class="article">
-		<!-- #ifdef APP-PLUS -->
-		<uni-nav-bar :statusBar="true" :border="false"></uni-nav-bar>
-		<!-- #endif -->
-		<view class="article-title">{{ title }}</view>
-		<unicloud-db v-slot:default="{data, loading, error, options}" :options="formData" collection="opendb-news-articles,uni-id-users"
-			:field="field" :getone="true" :where="where" :manual="true" ref="detail"
-			foreignKey="opendb-news-articles.user_id" @load="loadData">
-			<template v-if="!loading && data">
-				<uni-list :border="false">
-					<uni-list-item thumbSize="lg" :thumb="data.image">
-						<!-- 通过body插槽定义作者信息内容 -->
-						<template v-slot:body>  
-							<view class="header-content">
-								<view class="uni-title">{{data.user_id && data.user_id[0] && data.user_id[0].nickname || '未知'}}</view>
-							</view>
-						</template>
-						<template v-slot:footer>
-							<view class="footer">
-								<view class="uni-note">更新于
-									<uni-dateformat :date="data.last_modify_date" format="yyyy-MM-dd hh:mm"
-										:threshold="[60000, 2592000000]" />
-								</view>
-							</view>
-						</template>
-					</uni-list-item>
-				</uni-list>
-				<view class="banner">
-					<!-- 文章开头，缩略图 -->
-					<image class="banner-img" :src="data.avatar" mode="widthFix"></image>
-					<!-- 文章摘要 -->
-					<view class="banner-title">
-						<text class="uni-ellipsis">{{data.excerpt}}</text>
-					</view>
-				</view>
-				<view class="article-content">
-					<rich-text :nodes="data.content"></rich-text>
-				</view>
-			</template>
-		</unicloud-db>
-	</view>
-</template>
-
-<script>
-	// #ifdef APP
-	import UniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
-	import uniNavBar from '@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue';
-	const uniShare = new UniShare()
-	// #endif
-	const db = uniCloud.database();
-	const readNewsLog = db.collection('read-news-log')
-	export default {
-		// #ifdef APP
-		components:{
-			"uni-nav-bar":uniNavBar
-		},
-		onBackPress({from}) {
-			if(from == 'backbutton'){
-				if(uniShare.isShow){
-					this.$nextTick(function(){
-						console.log(uniShare);
-						uniShare.hide()
-					})
-				}
-				return uniShare.isShow;
-			}
-		},
-		// #endif
-		data() {
-			return {
-				// 当前显示 _id
-				id: "",
-				title: 'title',
-				// 数据表名
-				// 查询字段，多个字段用 , 分割
-				field: 'user_id.nickname,user_id._id,avatar,excerpt,last_modify_date,comment_count,like_count,title,content',
-				formData: {
-					noData: '<p style="text-align:center;color:#666">详情加载中...</p>'
-				}
-			}
-		},
-		computed: {
-			uniStarterConfig() {
-				return getApp().globalData.config
-			},
-			where(){
-				//拼接where条件 查询条件 ,更多详见 ：https://uniapp.dcloud.net.cn/uniCloud/unicloud-db?id=jsquery
-				return `_id =="${this.id}"`
-			}
-		},
-		onLoad(event) {
-			//获取真实新闻id，通常 id 来自上一个页面
-			if (event.id) {
-				this.id = event.id
-			}
-			//若上一页传递了标题过来，则设置导航栏标题
-			if (event.title) {
-				this.title = event.title
-				uni.setNavigationBarTitle({
-					title: event.title
-				})
-			}
-		},
-		onReady() {
-			// 开始加载数据，修改 where 条件后才开始去加载 clinetDB 的数据 ，需要等组件渲染完毕后才开始执行 loadData，所以不能再 onLoad 中执行
-			if (this.id) { // ID 不为空，则发起查询
-				this.$refs.detail.loadData()
-			} else {
-				uni.showToast({
-					icon: 'none',
-					title: this.$t('listDetail.newsErr')
-				})
-			}
-		},
-		onNavigationBarButtonTap(event) {
-			if (event.type == 'share') {
-				this.shareClick();
-			}
-		},
-		methods: {
-			$log(...args){
-				console.log('args',...args,this.id)
-			},
-			setReadNewsLog(){
-				let item = {
-					"article_id":this.id,
-					"last_time":Date.now()
-				},
-				readNewsLog = uni.getStorageSync('readNewsLog')||[],
-				index = -1;
-				readNewsLog.forEach(({article_id},i)=>{
-					if(article_id == item.article_id){
-						index = i
-					}
-				})
-				if(index === -1){
-					readNewsLog.push(item)
-				}else{
-					readNewsLog.splice(index,1,item)
-				}
-				uni.setStorageSync('readNewsLog',readNewsLog)
-				console.log(readNewsLog);
-			},
-			setFavorite() {
-				if ( uniCloud.getCurrentUserInfo().tokenExpired < Date.now() ){
-					return console.log('未登录用户');
-				}
-				let article_id = this.id,
-					last_time = Date.now();
-					console.log({article_id,last_time});
-					readNewsLog.where(`"article_id" == "${article_id}" && "user_id"==$env.uid`)
-						.update({last_time})
-						.then(({result:{updated}}) => {
-							console.log('updated',updated);
-							if (!updated) {
-								readNewsLog.add({article_id}).then(e=>{
-									console.log(e);
-								}).catch(err => {
-									console.log(err);
-								})
-							}
-						}).catch(err => {
-							console.log(err);
-						})
-			},
-			loadData(data) {
-				//如果上一页未传递标题过来（如搜索直达详情），则从新闻详情中读取标题
-				if (this.title == '' && data[0].title) {
-					this.title = data[0].title
-					uni.setNavigationBarTitle({
-						title: data[0].title
-					});
-
-				}
-				this.setReadNewsLog();
-			},
-			/**
-			 * followClick
-			 * 点击关注
-			 */
-			followClick() {
-				uni.showToast({
-					title:this.$t('listDetail.follow'),
-					icon: 'none'
-				});
-			},
-			/**
-			 * 分享该文章
-			 */
-			// #ifdef APP
-			shareClick() {
-				let {
-					_id,
-					title,
-					excerpt,
-					avatar
-				} = this.$refs.detail.dataList
-				console.log( JSON.stringify({
-					_id,
-					title,
-					excerpt,
-					avatar
-				}) );
-				uniShare.show({
-					content: { //公共的分享类型（type）、链接（herf）、标题（title）、summary（描述）、imageUrl（缩略图）
-						type: 0,
-						href: this.uniStarterConfig.h5.url + `/#/pages/list/detail?id=${_id}&title=${title}`,
-						title: this.title,
-						summary: excerpt,
-						imageUrl: avatar + '?x-oss-process=image/resize,m_fill,h_100,w_100' //压缩图片解决，在ios端分享图过大导致的图片失效问题
-					},
-					menus: [{
-							"img": "/static/app-plus/sharemenu/wechatfriend.png",
-							"text": this.$t('common.wechatFriends'),
-							"share": {
-								"provider": "weixin",
-								"scene": "WXSceneSession"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/wechatmoments.png",
-							"text": this.$t('common.wechatBbs'),
-							"share": {
-								"provider": "weixin",
-								"scene": "WXSceneTimeline"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/mp_weixin.png",
-							"text": this.$t('common.wechatApplet'),
-							"share": {
-								provider: "weixin",
-								scene: "WXSceneSession",
-								type: 5,
-								miniProgram: {
-									id: this.uniStarterConfig.mp.weixin.id,
-									path: `/pages/list/detail?id=${_id}&title=${title}`,
-									webUrl: this.uniStarterConfig.h5.url +
-										`/#/pages/list/detail?id=${_id}&title=${title}`,
-									type: 0
-								},
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/weibo.png",
-							"text": this.$t('common.weibo'),
-							"share": {
-								"provider": "sinaweibo"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/qq.png",
-							"text": "QQ",
-							"share": {
-								"provider": "qq"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/copyurl.png",
-							"text": this.$t('common.copy'),
-							"share": "copyurl"
-						},
-						{
-							"img": "/static/app-plus/sharemenu/more.png",
-							"text": this.$t('common.more'),
-							"share": "shareSystem"
-						}
-					],
-					cancelText: this.$t('common.cancelShare'),
-				}, e => { //callback
-					console.log(e);
-				})
-			}
-			// #endif
-		}
-	}
-</script>
-
-<style scoped>
-	.header-content {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		font-size: 14px;
-	}
-
-	/* 标题 */
-	.uni-title {
-		display: flex;
-		margin-bottom: 5px;
-		font-size: 14px;
-		font-weight: bold;
-		color: #3b4144;
-	}
-
-	/* 描述 额外文本 */
-	.uni-note {
-		color: #999;
-		font-size: 12px;
-
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.footer {
-		display: flex;
-		align-items: center;
-	}
-
-	.footer-button {
-		display: flex;
-		align-items: center;
-		font-size: 12px;
-		height: 30px;
-		color: #fff;
-		background-color: #ff5a5f;
-	}
-
-	.banner {
-		position: relative;
-		margin: 0 15px;
-		height: 180px;
-		overflow: hidden;
-	}
-
-	.banner-img {
-		position: absolute;
-		width: 100%;
-	}
-
-	.banner-title {
-		display: flex;
-		align-items: center;
-		position: absolute;
-		padding: 0 15px;
-		width: 100%;
-		bottom: 0;
-		height: 30px;
-		font-size: 14px;
-		color: #fff;
-		background: rgba(0, 0, 0, 0.4);
-		overflow: hidden;
-		box-sizing: border-box;
-	}
-
-	.uni-ellipsis {
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-
-	.article-title {
-		padding: 20px 15px;
-		padding-bottom: 0;
-	}
-
-	.article-content {
-		padding: 15px;
-		font-size: 15px;
-		overflow: hidden;
-	}
-</style>
diff --git a/pages/list/list.nvue b/pages/list/list.nvue
deleted file mode 100644
index a4a0e46..0000000
--- a/pages/list/list.nvue
+++ /dev/null
@@ -1,206 +0,0 @@
-<template>
-	<view class="pages">
-		<!-- #ifndef H5 -->
-		<statusBar></statusBar>
-		<!-- #endif -->
-		<info-list></info-list>
-		 
- 
-	</view>
-</template>
-
-<script>
-	let cdbRef;
-
-	import infoList from '@/pagesPackage/ngtools_information/list.vue'
-
-	import statusBar from "@/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar";
-
-	import Gps from '@/uni_modules/json-gps/js_sdk/gps.js';
-	const gps = new Gps(),
-		db = uniCloud.database();
-
-	export default {
-		components: {
-			statusBar,
-			infoList
-		},
-		computed: {
-			inputPlaceholder(e) {
-				if (uni.getStorageSync('CURRENT_LANG') == "en") {
-					return 'Please enter the search content'
-				} else {
-					return '请输入搜索内容'
-				}
-			},
-			colList() {
-				return [
-					db.collection('opendb-news-articles').where(this.where).field(
-						'avatar,title,last_modify_date,user_id').getTemp(),
-					db.collection('uni-id-users').field('_id,nickname').getTemp()
-				]
-			}
-		},
-		data() {
-			return {
-				where: '"article_status" == 1',
-				keyword: "",
-				showRefresh: false,
-				listHight: 0
-			}
-		},
-		watch: {
-			keyword(keyword, oldValue) {
-				let where = '"article_status" == 1 '
-				if (keyword) {
-					this.where = where + `&& /${keyword}/.test(title)`;
-				} else {
-					this.where = where;
-				}
-			}
-		},
-		async onReady() {
-			// #ifdef APP-NVUE
-			/* 可用窗口高度 - 搜索框高 - 状态栏高 */
-			this.listHight = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - 50 +
-			'px';
-			// #endif
-			// #ifndef APP-NVUE
-			this.listHight = 'auto'
-			// #endif
-			cdbRef = this.$refs.udb
-		},
-		async onShow() {
-			this.keyword = getApp().globalData.searchText
-			getApp().globalData.searchText = ''
-			//这里仅演示如何，在onShow生命周期获取设备位置，并在设备或者应用没有权限时自动引导。设置完毕自动重新获取。
-			//你可以基于他做自己的业务，比如：根据距离由近到远排序列表数据等
-			// uni.showLoading({
-			// 	title:"获取定位中"
-			// });
-			//默认h5端不获取定位
-			// #ifndef H5
-			let location = await gps.getLocation({
-				geocode: true
-			})
-			// console.log(location);
-			// #endif
-			// if(location){
-			// 	uni.showToast({
-			// 		title: JSON.stringify(location),
-			// 		icon: 'none'
-			// 	});
-			// }
-			// uni.hideLoading()
-		},
-		methods: {
-			searchClick(e) { //点击搜索框
-				uni.hideKeyboard();
-				uni.navigateTo({
-					url: '/pages/list/search/search',
-					animationType: 'fade-in'
-				});
-			},
-			retry() {
-				this.refresh()
-			},
-			refresh() {
-				cdbRef.loadData({
-					clear: true
-				}, () => {
-					uni.stopPullDownRefresh()
-					// #ifdef APP-NVUE
-					this.showRefresh = false
-					// #endif
-					console.log('end');
-				})
-				console.log('refresh');
-			},
-			loadMore() {
-				cdbRef.loadMore()
-			},
-			onqueryerror(e) {
-				console.error(e);
-			},
-			onpullingdown(e) {
-				console.log(e);
-				this.showRefresh = true
-				if (e.pullingDistance > 100) {
-					this.refresh()
-				}
-			}
-		},
-		// #ifndef APP-NVUE
-		onPullDownRefresh() {
-			this.refresh()
-		},
-		onReachBottom() {
-			this.loadMore()
-		}
-		// #endif
-	}
-</script>
-
-<style scoped>
-	/* #ifndef APP-NVUE */
-	view {
-		display: flex;
-		box-sizing: border-box;
-		flex-direction: column;
-	}
-
-	/* #endif */
-	.pages {
-		background-color: #FFFFFF;
-	}
-
-	.avatar {
-		width: 200rpx;
-		height: 200rpx;
-		margin-right: 10rpx;
-	}
-
-	.main {
-		justify-content: space-between;
-		flex: 1;
-	}
-
-	.title {
-		font-size: 16px;
-	}
-
-	.info {
-		flex-direction: row;
-		justify-content: space-between;
-	}
-
-	.author,
-	.last_modify_date {
-		font-size: 14px;
-		color: #999999;
-	}
-
-	.uni-search-box {
-		background-color: #FFFFFF;
-		position: sticky;
-		height: 50px;
-		top: 0;
-		left: 0;
-		/* #ifndef APP-PLUS */
-		z-index: 9;
-		/* #endif */
-		/* #ifdef MP-WEIXIN */
-		width: 580rpx;
-		/* #endif */
-	}
-
-	.cover-search-bar {
-		height: 50px;
-		position: relative;
-		top: -50px;
-		margin-bottom: -50px;
-		/* #ifndef APP-NVUE */
-		z-index: 999;
-		/* #endif */
-	}
-</style>
\ No newline at end of file
diff --git a/pages/ucenter.vue b/pages/ucenter.vue
deleted file mode 100644
index 8512bc1..0000000
--- a/pages/ucenter.vue
+++ /dev/null
@@ -1,505 +0,0 @@
-<template>
-	<view class="center">
-		<uni-sign-in ref="signIn"></uni-sign-in>
-		<view class="userInfo" @click.capture="toUserInfo">
-			<cloud-image width="150rpx" height="150rpx" v-if="hasLogin&&userInfo.avatar_file&&userInfo.avatar_file.url"
-				:src="userInfo.avatar_file.url"></cloud-image>
-
-			<view v-else class="defaultAvatarUrl">
-				<uni-icons color="#ffffff" size="50" type="person-filled" />
-			</view>
-
-			<view class="logo-title">
-
-				<text class="uer-name" v-if="hasLogin">{{userInfo.nickname||userInfo.username||userInfo.mobile}}</text>
-				<text class="uer-name" v-else>{{$t('mine.notLogged')}}</text>
-			</view>
-		</view>
-		<!-- <uni-grid class="grid" :column="4" :showBorder="false" :square="true">
-			<uni-grid-item class="item" v-for="(item,index) in gridList" @click.native="tapGrid(index)" :key="index">
-				<uni-icons class="icon" color="#007AFF" :type="item.icon" size="26"></uni-icons>
-				<text class="text">{{item.text}}</text>
-			</uni-grid-item>
-		</uni-grid> -->
-		<uni-list class="center-list" v-for="(sublist , index) in ucenterList" :key="index">
-			<uni-list-item v-for="(item,i) in sublist" :title="item.title" link :rightText="item.rightText" :key="i"
-				:clickable="true" :to="item.to" @click="ucenterListClick(item)" :show-extra-icon="true"
-				:extraIcon="{type:item.icon,color:'#999'}">
-				<template v-slot:footer>
-					<view v-if="item.showBadge" class="item-footer">
-						<text class="item-footer-text">{{item.rightText}}</text>
-						<view class="item-footer-badge"></view>
-					</view>
-				</template>
-			</uni-list-item>
-		</uni-list>
-	</view>
-</template>
-
-<script>
-	import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
-	import callCheckVersion from '@/uni_modules/uni-upgrade-center-app/utils/call-check-version';
-	// #ifdef APP
-	import UniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
-	const uniShare = new UniShare()
-	// #endif
-	const db = uniCloud.database();
-	import {
-		store,
-		mutations
-	} from '@/uni_modules/uni-id-pages/common/store.js'
-	export default {
-		// #ifdef APP
-		onBackPress({
-			from
-		}) {
-			if (from == 'backbutton') {
-				this.$nextTick(function() {
-					uniShare.hide()
-				})
-				return uniShare.isShow;
-			}
-		},
-		// #endif
-		data() {
-			return {
-				gridList: [{
-						"text": this.$t('mine.dict'),
-						"icon": "chat"
-					},
-					{
-						"text": this.$t('mine.showText'),
-						"icon": "cloud-upload"
-					},
-					{
-						"text": this.$t('mine.showText'),
-						"icon": "contact"
-					},
-					{
-						"text": this.$t('mine.showText'),
-						"icon": "download"
-					}
-				],
-				ucenterList: [
-					[
-
-						{
-							"title": this.$t('mine.dict'),
-							"event": 'dictSetting',
-							"icon": "compose"
-						},
-						{
-							"title": this.$t('mine.depart'),
-							"event": 'departSetting',
-							"icon": "compose"
-						},
-
-						// {
-						// 							"title": this.$t('mine.myPay'),
-						// 							"event": 'myPaySetting',
-						// 							"icon": "compose"
-						// 						}, 
-
-
-						// 	// #ifdef APP-PLUS
-						// 	{
-						// 		"title": this.$t('mine.toEvaluate'),
-						// 		"event": 'gotoMarket',
-						// 		"icon": "star"
-						// 	},
-						// 	//#endif
-						// 	{
-						// 		"title":this.$t('mine.readArticles'),
-						// 		"to": '/pages/ucenter/read-news-log/read-news-log',
-						// 		"icon": "flag"
-						// 	},
-						// 	{
-						// 		"title": this.$t('mine.myScore'),
-						// 		"to": '',
-						// 		"event": 'getScore',
-						// 		"icon": "paperplane"
-						// 	}
-						// 	// #ifdef APP-PLUS
-						// 	, {
-						// 		"title": this.$t('mine.invite'),
-						// 		"event": 'share',
-						// 		"icon": "redo"
-						// 	}
-						// 	// #endif
-					],
-					[
-					// 	{
-					// 	"title": this.$t('mine.feedback'),
-					// 	"to": '/uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback',
-					// 	"icon": "help"
-					// },
-					{
-						"title": this.$t('mine.settings'),
-						"to": '/pagesPackage/ucenter/settings/settings',
-						"icon": "gear"
-					}],
-					// #ifdef APP-PLUS
-					[{
-						"title": this.$t('mine.about'),
-						"to": '/pagesPackage/ucenter/about/about',
-						"icon": "info"
-					}]
-					// #endif
-				],
-				listStyles: {
-					"height": "150rpx", // 边框高度
-					"width": "150rpx", // 边框宽度
-					"border": { // 如果为 Boolean 值，可以控制边框显示与否
-						"color": "#eee", // 边框颜色
-						"width": "1px", // 边框宽度
-						"style": "solid", // 边框样式
-						"radius": "100%" // 边框圆角，支持百分比
-					}
-				}
-			}
-		},
-		onLoad() {
-			//#ifdef APP-PLUS
-			this.ucenterList[this.ucenterList.length - 2].unshift({
-				title: this.$t('mine.checkUpdate'), // this.this.$t('mine.checkUpdate')"检查更新"
-				rightText: this.appVersion.version + '-' + this.appVersion.versionCode,
-				event: 'checkVersion',
-				icon: 'loop',
-				showBadge: this.appVersion.hasNew
-			})
-			//#endif
-		},
-		onShow() {}, 
-		computed: {
-			userInfo() {
-				return store.userInfo
-			},
-			hasLogin() {
-				return store.hasLogin
-			},
-			// #ifdef APP-PLUS
-			appVersion() {
-				return getApp().appVersion
-			},
-			// #endif
-			appConfig() {
-				return getApp().globalData.config
-			}
-		},
-		methods: {
-			toSettings() {
-				uni.navigateTo({
-					url: "/pages/ucenter/settings/settings"
-				})
-			},
-			signIn() { //普通签到
-				this.$refs.signIn.open()
-			},
-			dictSetting() { //数据字典设置
-
-				uni.navigateTo({
-					url: "/pagesPackage/ngTools_Dict/list"
-				})
-
-			},
-			departSetting() { //组织机构设置
-
-				uni.navigateTo({
-					url: "/pagesPackage/ngTools_depart/list"
-				})
-
-			},
-			myPaySetting() { //购买打赏
-
-				uni.navigateTo({
-					url: "/pagesPackage/ucenter/pay/index"
-				})
-
-			},
-			/**
-			 * 个人中心项目列表点击事件
-			 */
-			ucenterListClick(item) {
-				if (!item.to && item.event) {
-					this[item.event]();
-				}
-			},
-			async checkVersion() {
-				let res = await callCheckVersion()
-				console.log(res);
-				if (res.result.code > 0) {
-					checkUpdate()
-				} else {
-					uni.showToast({
-						title: res.result.message,
-						icon: 'none'
-					});
-				}
-			},
-			toUserInfo() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/userinfo/userinfo'
-				})
-			},
-			tapGrid(index) {
-				uni.showToast({
-					// title: '你点击了，第' + (index + 1) + '个',
-					title: this.$t('mine.clicked') + " " + (index + 1),
-					icon: 'none'
-				});
-			},
-			/**
-			 * 去应用市场评分
-			 */
-			gotoMarket() {
-				// #ifdef APP-PLUS
-				if (uni.getSystemInfoSync().platform == "ios") {
-					// 这里填写appstore应用id
-					let appstoreid = this.appConfig.marketId.ios; // 'id1417078253';
-					console.log({
-						appstoreid
-					});
-					plus.runtime.openURL("itms-apps://" + 'itunes.apple.com/cn/app/wechat/' + appstoreid + '?mt=8',
-						err => {
-							console.log('plus.runtime.openURL err:' + JSON.stringify(err));
-						});
-				}
-				if (uni.getSystemInfoSync().platform == "android") {
-					var Uri = plus.android.importClass("android.net.Uri");
-					var uri = Uri.parse("market://details?id=" + this.appConfig.marketId.android);
-					var Intent = plus.android.importClass('android.content.Intent');
-					var intent = new Intent(Intent.ACTION_VIEW, uri);
-					var main = plus.android.runtimeMainActivity();
-					main.startActivity(intent);
-				}
-				// #endif
-			},
-			/**
-			 * 获取积分信息
-			 */
-			getScore() {
-				if (!this.userInfo) return uni.showToast({
-					title: this.$t('mine.checkScore'),
-					icon: 'none'
-				});
-				uni.showLoading({
-					mask: true
-				})
-				db.collection("uni-id-scores")
-					.where('"user_id" == $env.uid')
-					.field('score,balance')
-					.orderBy("create_date", "desc")
-					.limit(1)
-					.get()
-					.then((res) => {
-						console.log(res);
-						const data = res.result.data[0];
-						let msg = '';
-						msg = data ? (this.$t('mine.currentScore') + data.balance) : this.$t('mine.noScore');
-						uni.showToast({
-							title: msg,
-							icon: 'none'
-						});
-					}).finally(() => {
-						uni.hideLoading()
-					})
-			},
-			async share() {
-				let {
-					result
-				} = await db.collection('uni-id-users').where("'_id' == $cloudEnv_uid").field('my_invite_code').get()
-				let myInviteCode = result.data[0].my_invite_code
-				if (!myInviteCode) {
-					return uni.showToast({
-						title: '请检查uni-config-center中uni-id配置，是否已启用 autoSetInviteCode',
-						icon: 'none'
-					});
-				}
-				console.log({
-					myInviteCode
-				});
-				let {
-					appName,
-					logo,
-					company,
-					slogan
-				} = this.appConfig.about
-				// #ifdef APP-PLUS
-				uniShare.show({
-					content: { //公共的分享类型（type）、链接（herf）、标题（title）、summary（描述）、imageUrl（缩略图）
-						type: 0,
-						href: this.appConfig.h5.url +
-							`/#/pages/ucenter/invite/invite?code=uniInvitationCode:${myInviteCode}`,
-						title: appName,
-						summary: slogan,
-						imageUrl: logo +
-							'?x-oss-process=image/resize,m_fill,h_100,w_100' //压缩图片解决，在ios端分享图过大导致的图片失效问题
-					},
-					menus: [{
-							"img": "/static/app-plus/sharemenu/wechatfriend.png",
-							"text": this.$t('common.wechatFriends'),
-							"share": {
-								"provider": "weixin",
-								"scene": "WXSceneSession"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/wechatmoments.png",
-							"text": this.$t('common.wechatBbs'),
-							"share": {
-								"provider": "weixin",
-								"scene": "WXSceneTimeline"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/weibo.png",
-							"text": this.$t('common.weibo'),
-							"share": {
-								"provider": "sinaweibo"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/qq.png",
-							"text": "QQ",
-							"share": {
-								"provider": "qq"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/copyurl.png",
-							"text": this.$t('common.copy'),
-							"share": "copyurl"
-						},
-						{
-							"img": "/static/app-plus/sharemenu/more.png",
-							"text": this.$t('common.more'),
-							"share": "shareSystem"
-						}
-					],
-					cancelText: this.$t('common.cancelShare'),
-				}, e => { //callback
-					console.log(e);
-				})
-				// #endif
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	/* #ifndef APP-NVUE */
-	view {
-		display: flex;
-		box-sizing: border-box;
-		flex-direction: column;
-	}
-
-	page {
-		background-color: #f8f8f8;
-	}
-
-	/* #endif*/
-
-	.center {
-		flex: 1;
-		flex-direction: column;
-		background-color: #f8f8f8;
-	}
-
-	.userInfo {
-		// padding: 20rpx;
-		padding-top: 60px;
-		background-image: url(http://h5.ngtools.cn/pic/static/uni-center/headers.png);
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.defaultAvatarUrl {
-		width: 150rpx;
-		height: 150rpx;
-		background-color: #007aff;
-		border-radius: 100%;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.logo-title {
-		flex: 1;
-		align-items: center;
-		justify-content: space-between;
-		flex-direction: row;
-	}
-
-	.uer-name {
-		height: 100rpx;
-		line-height: 100rpx;
-		font-size: 38rpx;
-		color: blue;
-	}
-
-	.center-list {
-		margin-bottom: 30rpx;
-		background-color: #f9f9f9;
-	}
-
-	.center-list-cell {
-		width: 750rpx;
-		background-color: #007AFF;
-		height: 40rpx;
-	}
-
-	.grid {
-		background-color: #FFFFFF;
-		margin-bottom: 6px;
-	}
-
-	.uni-grid .text {
-		font-size: 16px;
-		height: 25px;
-		line-height: 25px;
-		color: #817f82;
-	}
-
-	.uni-grid .item ::v-deep .uni-grid-item__box {
-		justify-content: center;
-		align-items: center;
-	}
-
-
-	/*修改边线粗细示例*/
-	/* #ifndef APP-NVUE */
-	.center-list ::v-deep .uni-list--border:after {
-		-webkit-transform: scaleY(0.2);
-		transform: scaleY(0.2);
-		margin-left: 80rpx;
-	}
-
-	.center-list ::v-deep .uni-list--border-top,
-	.center-list ::v-deep .uni-list--border-bottom {
-		display: none;
-	}
-
-	/* #endif */
-	.item-footer {
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.item-footer-text {
-		color: #999;
-		font-size: 24rpx;
-		padding-right: 10rpx;
-	}
-
-	.item-footer-badge {
-		width: 20rpx;
-		height: 20rpx;
-		/* #ifndef APP-NVUE */
-		border-radius: 50%;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		border-radius: 10rpx;
-		/* #endif */
-		background-color: #DD524D;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
new file mode 100644
index 0000000..1e52aa4
--- /dev/null
+++ b/pages/ucenter/ucenter.vue
@@ -0,0 +1,508 @@
+<template>
+	<view class="center">
+		<uni-sign-in ref="signIn"></uni-sign-in>
+		<view class="userInfo" @click.capture="toUserInfo">
+			<cloud-image width="150rpx" height="150rpx" v-if="hasLogin && userInfo.avatar_file && userInfo.avatar_file.url" :src="userInfo.avatar_file.url"></cloud-image>
+
+			<view v-else class="defaultAvatarUrl">
+				<uni-icons color="#ffffff" size="50" type="person-filled" />
+			</view>
+
+			<view class="logo-title">
+				<text class="uer-name" v-if="hasLogin">{{ userInfo.nickname || userInfo.username || userInfo.mobile }}</text>
+				<text class="uer-name" v-else>{{ $t('mine.notLogged') }}</text>
+			</view>
+		</view>
+		<!-- <uni-grid class="grid" :column="4" :showBorder="false" :square="true">
+			<uni-grid-item class="item" v-for="(item,index) in gridList" @click.native="tapGrid(index)" :key="index">
+				<uni-icons class="icon" color="#007AFF" :type="item.icon" size="26"></uni-icons>
+				<text class="text">{{item.text}}</text>
+			</uni-grid-item>
+		</uni-grid> -->
+		<uni-list class="center-list" v-for="(sublist, index) in ucenterList" :key="index">
+			<uni-list-item
+				v-for="(item, i) in sublist"
+				:title="item.title"
+				link
+				:rightText="item.rightText"
+				:key="i"
+				:clickable="true"
+				:to="item.to"
+				@click="ucenterListClick(item)"
+				:show-extra-icon="true"
+				:extraIcon="{ type: item.icon, color: '#999' }"
+			>
+				<template v-slot:footer>
+					<view v-if="item.showBadge" class="item-footer">
+						<text class="item-footer-text">{{ item.rightText }}</text>
+						<view class="item-footer-badge"></view>
+					</view>
+				</template>
+			</uni-list-item>
+		</uni-list>
+	</view>
+</template>
+
+<script>
+import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
+import callCheckVersion from '@/uni_modules/uni-upgrade-center-app/utils/call-check-version';
+// #ifdef APP
+import UniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
+const uniShare = new UniShare();
+// #endif
+const db = uniCloud.database();
+import { store, mutations } from '@/uni_modules/uni-id-pages/common/store.js';
+export default {
+	// #ifdef APP
+	onBackPress({ from }) {
+		if (from == 'backbutton') {
+			this.$nextTick(function () {
+				uniShare.hide();
+			});
+			return uniShare.isShow;
+		}
+	},
+	// #endif
+	data() {
+		return {
+			gridList: [
+				{
+					text: this.$t('mine.dict'),
+					icon: 'chat'
+				},
+				{
+					text: this.$t('mine.showText'),
+					icon: 'cloud-upload'
+				},
+				{
+					text: this.$t('mine.showText'),
+					icon: 'contact'
+				},
+				{
+					text: this.$t('mine.showText'),
+					icon: 'download'
+				}
+			],
+			ucenterList: [
+				[
+					{
+						title: this.$t('mine.dict'),
+						event: 'dictSetting',
+						icon: 'compose'
+					},
+					{
+						title: this.$t('mine.depart'),
+						event: 'departSetting',
+						icon: 'compose'
+					}
+
+					// {
+					// 							"title": this.$t('mine.myPay'),
+					// 							"event": 'myPaySetting',
+					// 							"icon": "compose"
+					// 						},
+
+					// 	// #ifdef APP-PLUS
+					// 	{
+					// 		"title": this.$t('mine.toEvaluate'),
+					// 		"event": 'gotoMarket',
+					// 		"icon": "star"
+					// 	},
+					// 	//#endif
+					// 	{
+					// 		"title":this.$t('mine.readArticles'),
+					// 		"to": '/pages/ucenter/read-news-log/read-news-log',
+					// 		"icon": "flag"
+					// 	},
+					// 	{
+					// 		"title": this.$t('mine.myScore'),
+					// 		"to": '',
+					// 		"event": 'getScore',
+					// 		"icon": "paperplane"
+					// 	}
+					// 	// #ifdef APP-PLUS
+					// 	, {
+					// 		"title": this.$t('mine.invite'),
+					// 		"event": 'share',
+					// 		"icon": "redo"
+					// 	}
+					// 	// #endif
+				],
+				[
+					// 	{
+					// 	"title": this.$t('mine.feedback'),
+					// 	"to": '/uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback',
+					// 	"icon": "help"
+					// },
+					{
+						title: this.$t('mine.settings'),
+						to: '/pagesPackage/ucenter/settings/settings',
+						icon: 'gear'
+					}
+				],
+				// #ifdef APP-PLUS
+				[
+					{
+						title: this.$t('mine.about'),
+						to: '/pagesPackage/ucenter/about/about',
+						icon: 'info'
+					}
+				]
+				// #endif
+			],
+			listStyles: {
+				height: '150rpx', // 边框高度
+				width: '150rpx', // 边框宽度
+				border: {
+					// 如果为 Boolean 值，可以控制边框显示与否
+					color: '#eee', // 边框颜色
+					width: '1px', // 边框宽度
+					style: 'solid', // 边框样式
+					radius: '100%' // 边框圆角，支持百分比
+				}
+			}
+		};
+	},
+	onLoad() {
+		//#ifdef APP-PLUS
+		this.ucenterList[this.ucenterList.length - 2].unshift({
+			title: this.$t('mine.checkUpdate'), // this.this.$t('mine.checkUpdate')"检查更新"
+			rightText: this.appVersion.version + '-' + this.appVersion.versionCode,
+			event: 'checkVersion',
+			icon: 'loop',
+			showBadge: this.appVersion.hasNew
+		});
+		//#endif
+	},
+	onShow() {},
+	computed: {
+		userInfo() {
+			return store.userInfo;
+		},
+		hasLogin() {
+			return store.hasLogin;
+		},
+		// #ifdef APP-PLUS
+		appVersion() {
+			return getApp().appVersion;
+		},
+		// #endif
+		appConfig() {
+			return getApp().globalData.config;
+		}
+	},
+	methods: {
+		toSettings() {
+			uni.navigateTo({
+				url: '/pages/ucenter/settings/settings'
+			});
+		},
+		signIn() {
+			//普通签到
+			this.$refs.signIn.open();
+		},
+		dictSetting() {
+			//数据字典设置
+
+			uni.navigateTo({
+				url: '/pagesPackage/ngTools_Dict/list'
+			});
+		},
+		departSetting() {
+			//组织机构设置
+
+			uni.navigateTo({
+				url: '/pagesPackage/ngTools_depart/list'
+			});
+		},
+		myPaySetting() {
+			//购买打赏
+
+			uni.navigateTo({
+				url: '/pagesPackage/ucenter/pay/index'
+			});
+		},
+		/**
+		 * 个人中心项目列表点击事件
+		 */
+		ucenterListClick(item) {
+			if (!item.to && item.event) {
+				this[item.event]();
+			}
+		},
+		async checkVersion() {
+			let res = await callCheckVersion();
+			console.log(res);
+			if (res.result.code > 0) {
+				checkUpdate();
+			} else {
+				uni.showToast({
+					title: res.result.message,
+					icon: 'none'
+				});
+			}
+		},
+		toUserInfo() {
+			uni.navigateTo({
+				url: '/uni_modules/uni-id-pages/pages/userinfo/userinfo'
+			});
+		},
+		tapGrid(index) {
+			uni.showToast({
+				// title: '你点击了，第' + (index + 1) + '个',
+				title: this.$t('mine.clicked') + ' ' + (index + 1),
+				icon: 'none'
+			});
+		},
+		/**
+		 * 去应用市场评分
+		 */
+		gotoMarket() {
+			// #ifdef APP-PLUS
+			if (uni.getSystemInfoSync().platform == 'ios') {
+				// 这里填写appstore应用id
+				let appstoreid = this.appConfig.marketId.ios; // 'id1417078253';
+				console.log({
+					appstoreid
+				});
+				plus.runtime.openURL('itms-apps://' + 'itunes.apple.com/cn/app/wechat/' + appstoreid + '?mt=8', (err) => {
+					console.log('plus.runtime.openURL err:' + JSON.stringify(err));
+				});
+			}
+			if (uni.getSystemInfoSync().platform == 'android') {
+				var Uri = plus.android.importClass('android.net.Uri');
+				var uri = Uri.parse('market://details?id=' + this.appConfig.marketId.android);
+				var Intent = plus.android.importClass('android.content.Intent');
+				var intent = new Intent(Intent.ACTION_VIEW, uri);
+				var main = plus.android.runtimeMainActivity();
+				main.startActivity(intent);
+			}
+			// #endif
+		},
+		/**
+		 * 获取积分信息
+		 */
+		getScore() {
+			if (!this.userInfo)
+				return uni.showToast({
+					title: this.$t('mine.checkScore'),
+					icon: 'none'
+				});
+			uni.showLoading({
+				mask: true
+			});
+			db.collection('uni-id-scores')
+				.where('"user_id" == $env.uid')
+				.field('score,balance')
+				.orderBy('create_date', 'desc')
+				.limit(1)
+				.get()
+				.then((res) => {
+					console.log(res);
+					const data = res.result.data[0];
+					let msg = '';
+					msg = data ? this.$t('mine.currentScore') + data.balance : this.$t('mine.noScore');
+					uni.showToast({
+						title: msg,
+						icon: 'none'
+					});
+				})
+				.finally(() => {
+					uni.hideLoading();
+				});
+		},
+		async share() {
+			let { result } = await db.collection('uni-id-users').where("'_id' == $cloudEnv_uid").field('my_invite_code').get();
+			let myInviteCode = result.data[0].my_invite_code;
+			if (!myInviteCode) {
+				return uni.showToast({
+					title: '请检查uni-config-center中uni-id配置，是否已启用 autoSetInviteCode',
+					icon: 'none'
+				});
+			}
+			console.log({
+				myInviteCode
+			});
+			let { appName, logo, company, slogan } = this.appConfig.about;
+			// #ifdef APP-PLUS
+			uniShare.show(
+				{
+					content: {
+						//公共的分享类型（type）、链接（herf）、标题（title）、summary（描述）、imageUrl（缩略图）
+						type: 0,
+						href: this.appConfig.h5.url + `/#/pages/ucenter/invite/invite?code=uniInvitationCode:${myInviteCode}`,
+						title: appName,
+						summary: slogan,
+						imageUrl: logo + '?x-oss-process=image/resize,m_fill,h_100,w_100' //压缩图片解决，在ios端分享图过大导致的图片失效问题
+					},
+					menus: [
+						{
+							img: '/static/app-plus/sharemenu/wechatfriend.png',
+							text: this.$t('common.wechatFriends'),
+							share: {
+								provider: 'weixin',
+								scene: 'WXSceneSession'
+							}
+						},
+						{
+							img: '/static/app-plus/sharemenu/wechatmoments.png',
+							text: this.$t('common.wechatBbs'),
+							share: {
+								provider: 'weixin',
+								scene: 'WXSceneTimeline'
+							}
+						},
+						{
+							img: '/static/app-plus/sharemenu/weibo.png',
+							text: this.$t('common.weibo'),
+							share: {
+								provider: 'sinaweibo'
+							}
+						},
+						{
+							img: '/static/app-plus/sharemenu/qq.png',
+							text: 'QQ',
+							share: {
+								provider: 'qq'
+							}
+						},
+						{
+							img: '/static/app-plus/sharemenu/copyurl.png',
+							text: this.$t('common.copy'),
+							share: 'copyurl'
+						},
+						{
+							img: '/static/app-plus/sharemenu/more.png',
+							text: this.$t('common.more'),
+							share: 'shareSystem'
+						}
+					],
+					cancelText: this.$t('common.cancelShare')
+				},
+				(e) => {
+					//callback
+					console.log(e);
+				}
+			);
+			// #endif
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+/* #ifndef APP-NVUE */
+view {
+	display: flex;
+	box-sizing: border-box;
+	flex-direction: column;
+}
+
+page {
+	background-color: #f8f8f8;
+}
+
+/* #endif*/
+
+.center {
+	flex: 1;
+	flex-direction: column;
+	background-color: #f8f8f8;
+}
+
+.userInfo {
+	// padding: 20rpx;
+	padding-top: 60px;
+	background-image: url(http://ngtools.cn:3000/pic/static/uni-center/headers.png);
+	flex-direction: column;
+	align-items: center;
+}
+
+.defaultAvatarUrl {
+	width: 150rpx;
+	height: 150rpx;
+	background-color: #007aff;
+	border-radius: 100%;
+	justify-content: center;
+	align-items: center;
+}
+
+.logo-title {
+	flex: 1;
+	align-items: center;
+	justify-content: space-between;
+	flex-direction: row;
+}
+
+.uer-name {
+	height: 100rpx;
+	line-height: 100rpx;
+	font-size: 38rpx;
+	color: blue;
+}
+
+.center-list {
+	margin-bottom: 30rpx;
+	background-color: #f9f9f9;
+}
+
+.center-list-cell {
+	width: 750rpx;
+	background-color: #007aff;
+	height: 40rpx;
+}
+
+.grid {
+	background-color: #ffffff;
+	margin-bottom: 6px;
+}
+
+.uni-grid .text {
+	font-size: 16px;
+	height: 25px;
+	line-height: 25px;
+	color: #817f82;
+}
+
+.uni-grid .item ::v-deep .uni-grid-item__box {
+	justify-content: center;
+	align-items: center;
+}
+
+/*修改边线粗细示例*/
+/* #ifndef APP-NVUE */
+.center-list ::v-deep .uni-list--border:after {
+	-webkit-transform: scaleY(0.2);
+	transform: scaleY(0.2);
+	margin-left: 80rpx;
+}
+
+.center-list ::v-deep .uni-list--border-top,
+.center-list ::v-deep .uni-list--border-bottom {
+	display: none;
+}
+
+/* #endif */
+.item-footer {
+	flex-direction: row;
+	align-items: center;
+}
+
+.item-footer-text {
+	color: #999;
+	font-size: 24rpx;
+	padding-right: 10rpx;
+}
+
+.item-footer-badge {
+	width: 20rpx;
+	height: 20rpx;
+	/* #ifndef APP-NVUE */
+	border-radius: 50%;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	border-radius: 10rpx;
+	/* #endif */
+	background-color: #dd524d;
+}
+</style>
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000..b5771e2
Binary files /dev/null and b/static/logo.png differ
diff --git a/static/tabbar/cal.png b/static/tabbar/cal.png
new file mode 100644
index 0000000..ff9cbb4
Binary files /dev/null and b/static/tabbar/cal.png differ
diff --git a/static/tabbar/cal_active.png b/static/tabbar/cal_active.png
new file mode 100644
index 0000000..25c5bb6
Binary files /dev/null and b/static/tabbar/cal_active.png differ
diff --git a/static/tabbar/grid.png b/static/tabbar/grid.png
deleted file mode 100644
index 938b821..0000000
Binary files a/static/tabbar/grid.png and /dev/null differ
diff --git a/static/tabbar/grid_active.png b/static/tabbar/grid_active.png
deleted file mode 100644
index 807d9c7..0000000
Binary files a/static/tabbar/grid_active.png and /dev/null differ
diff --git a/static/tabbar/info.png b/static/tabbar/info.png
new file mode 100644
index 0000000..982c160
Binary files /dev/null and b/static/tabbar/info.png differ
diff --git a/static/tabbar/info_active.png b/static/tabbar/info_active.png
new file mode 100644
index 0000000..c5a79b4
Binary files /dev/null and b/static/tabbar/info_active.png differ
diff --git a/uniCloud-aliyun/database/ngTools_Dict.schema.json b/uniCloud-aliyun/database/ngTools_Dict.schema.json
index db31dca..54614fd 100644
--- a/uniCloud-aliyun/database/ngTools_Dict.schema.json
+++ b/uniCloud-aliyun/database/ngTools_Dict.schema.json
@@ -1 +1,63 @@
-{"bsonType":"object","required":[],"permission":{"read":true,"create":true,"update":true,"delete":true},"properties":{"_id":{"description":"ID，系统自动生成"},"dictName":{"description":"字典名称","bsonType":"string","title":"字典名称","trim":"both"},"dictCode":{"description":"字典编码","bsonType":"string","title":"字典编码","trim":"both"},"description":{"description":"描述","bsonType":"string","title":"描述","trim":"both"},"delFlag":{"description":"删除状态","bsonType":"int","title":"删除状态","trim":"both"},"createTime":{"description":"创建时间","bsonType":"string","title":"创建时间","trim":"both"},"createBy":{"description":"创建人","bsonType":"string","title":"创建人","trim":"both"},"updateTime":{"description":"更新时间","bsonType":"datetime","title":"更新时间","trim":"both"},"updateBy":{"description":"更新人","bsonType":"string","title":"更新人","trim":"both"}}}
\ No newline at end of file
+{
+	"bsonType": "object",
+	"required": [],
+	"permission": {
+		"read": true,
+		"create": true,
+		"update": true,
+		"delete": true
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"dictName": {
+			"description": "字典名称",
+			"bsonType": "string",
+			"title": "字典名称",
+			"trim": "both"
+		},
+		"dictCode": {
+			"description": "字典编码",
+			"bsonType": "string",
+			"title": "字典编码",
+			"trim": "both"
+		},
+		"description": {
+			"description": "描述",
+			"bsonType": "string",
+			"title": "描述",
+			"trim": "both"
+		},
+		"delFlag": {
+			"description": "删除状态",
+			"bsonType": "int",
+			"title": "删除状态",
+			"trim": "both"
+		},
+		"createTime": {
+			"description": "创建时间",
+			"bsonType": "string",
+			"title": "创建时间",
+			"trim": "both"
+		},
+		"createBy": {
+			"description": "创建人",
+			"bsonType": "string",
+			"title": "创建人",
+			"trim": "both"
+		},
+		"updateTime": {
+			"description": "更新时间",
+			"bsonType": "datetime",
+			"title": "更新时间",
+			"trim": "both"
+		},
+		"updateBy": {
+			"description": "更新人",
+			"bsonType": "string",
+			"title": "更新人",
+			"trim": "both"
+		}
+	}
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/ngTools_DictItem.schema.json b/uniCloud-aliyun/database/ngTools_DictItem.schema.json
index b3e2069..2ad4b1b 100644
--- a/uniCloud-aliyun/database/ngTools_DictItem.schema.json
+++ b/uniCloud-aliyun/database/ngTools_DictItem.schema.json
@@ -1 +1,82 @@
-{"bsonType":"object","required":[],"permission":{"read":true,"create":true,"update":true,"delete":true},"properties":{"_id":{"description":"ID，系统自动生成"},"dictID":{"description":"字典ID","bsonType":"string","title":"字典ID","trim":"both"},"itemValue":{"description":"字典项值","bsonType":"string","title":"字典项值","trim":"both","length":"1024"},"itemText":{"description":"字典项文本","bsonType":"string","title":"字典项文本","trim":"both"},"itemColor":{"description":"字典项颜色","bsonType":"string","title":"字典项颜色","trim":"both"},"description":{"description":"描述","bsonType":"string","title":"描述","trim":"both"},"sortOrder":{"description":"排序","bsonType":"string","title":"排序","trim":"both"},"status":{"description":"状态","bsonType":"int","title":"状态","trim":"both"},"createTime":{"description":"创建时间","bsonType":"datetime","title":"创建时间","trim":"both"},"createBy":{"description":"创建人","bsonType":"string","title":"创建人","trim":"both"},"updateTime":{"description":"更新时间","bsonType":"datetime","title":"更新时间","trim":"both"},"updateBy":{"description":"更新人","bsonType":"string","title":"更新人","trim":"both"}}}
\ No newline at end of file
+{
+	"bsonType": "object",
+	"required": [],
+	"permission": {
+		"read": true,
+		"create": true,
+		"update": true,
+		"delete": true
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"dictID": {
+			"description": "字典ID",
+			"bsonType": "string",
+			"title": "字典ID",
+			"trim": "both"
+		},
+		"itemValue": {
+			"description": "字典项值",
+			"bsonType": "string",
+			"title": "字典项值",
+			"trim": "both",
+			"length": "1024"
+		},
+		"itemText": {
+			"description": "字典项文本",
+			"bsonType": "string",
+			"title": "字典项文本",
+			"trim": "both"
+		},
+		"itemColor": {
+			"description": "字典项颜色",
+			"bsonType": "string",
+			"title": "字典项颜色",
+			"trim": "both"
+		},
+		"description": {
+			"description": "描述",
+			"bsonType": "string",
+			"title": "描述",
+			"trim": "both"
+		},
+		"sortOrder": {
+			"description": "排序",
+			"bsonType": "string",
+			"title": "排序",
+			"trim": "both"
+		},
+		"status": {
+			"description": "状态",
+			"bsonType": "int",
+			"title": "状态",
+			"trim": "both"
+		},
+		"createTime": {
+			"description": "创建时间",
+			"bsonType": "datetime",
+			"title": "创建时间",
+			"trim": "both"
+		},
+		"createBy": {
+			"description": "创建人",
+			"bsonType": "string",
+			"title": "创建人",
+			"trim": "both"
+		},
+		"updateTime": {
+			"description": "更新时间",
+			"bsonType": "datetime",
+			"title": "更新时间",
+			"trim": "both"
+		},
+		"updateBy": {
+			"description": "更新人",
+			"bsonType": "string",
+			"title": "更新人",
+			"trim": "both"
+		}
+	}
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/ngTools_MeterPar.schema.json b/uniCloud-aliyun/database/ngTools_MeterPar.schema.json
index faebca6..1b4ea2e 100644
--- a/uniCloud-aliyun/database/ngTools_MeterPar.schema.json
+++ b/uniCloud-aliyun/database/ngTools_MeterPar.schema.json
@@ -1 +1,351 @@
-{"bsonType":"object","required":[],"permission":{"read":false,"create":false,"update":false,"delete":false},"properties":{"_id":{"description":"ID，系统自动生成"},"createTime":{"description":"创建时间","bsonType":"datetime","title":"创建时间","trim":"both"},"createBy":{"description":"创建人","bsonType":"string","title":"创建人","trim":"both"},"updateTime":{"description":"更新时间","bsonType":"datetime","title":"更新时间","trim":"both"},"updateBy":{"description":"更新人","bsonType":"string","title":"更新人","trim":"both"},"meterID":{"description":"计量点编号","bsonType":"string","title":"计量点编号","trim":"both"},"dFlowCalbz":{"description":"流量计算标准","bsonType":"string","title":"流量计算标准","trim":"both"},"dZcalbz":{"description":"压缩因子计算标准","bsonType":"string","title":"压缩因子计算标准","trim":"both"},"dCbtj":{"description":"计量参比条件","bsonType":"string","title":"计量参比条件","trim":"both"},"dRsCbtj":{"description":"燃烧参比条件","bsonType":"string","title":"燃烧参比条件","trim":"both"},"dPb_M":{"description":"计量参比条件压力","bsonType":"string","title":"计量参比条件压力","trim":"both"},"dTb_M":{"description":"计量参比条件温度","bsonType":"string","title":"计量参比条件温度","trim":"both"},"dPb_E":{"description":"燃烧参比条件压力","bsonType":"string","title":"燃烧参比条件压力","trim":"both"},"dTb_E":{"description":"燃烧参比条件温度","bsonType":"string","title":"燃烧参比条件温度","trim":"both"},"dPatm":{"description":"当地大气压","bsonType":"string","title":"当地大气压","trim":"both"},"dPatmUnit":{"description":"当地大气压单位","bsonType":"string","title":"当地大气压单位","trim":"both"},"dNG_Compents":{"description":"天然气组分","bsonType":"string","title":"天然气组分","trim":"both"},"dMeterType":{"description":"流量计类别","bsonType":"string","title":"流量计类别","trim":"both"},"dCoreType":{"description":"节流装置类型","bsonType":"string","title":"节流装置类型","trim":"both"},"dPtmode":{"description":"取压方式","bsonType":"string","title":"取压方式","trim":"both"},"dPipeType":{"description":"管道类型","bsonType":"string","title":"管道类型","trim":"both"},"dPipeD":{"description":"管道内径","bsonType":"string","title":"管道内径","trim":"both"},"dLenUnit":{"description":"长度单位","bsonType":"string","title":"长度单位","trim":"both"},"dPipeDtemp":{"description":"管道内径参考温度","bsonType":"string","title":"管道内径参考温度","trim":"both"},"dPileDtempU":{"description":"温度单位","bsonType":"string","title":"温度单位","trim":"both"},"dPipeMaterial":{"description":"管道材料","bsonType":"string","title":"管道材料","trim":"both"},"dOrificeD":{"description":"孔板孔径","bsonType":"string","title":"孔板孔径","trim":"both"},"dOrificeUnit":{"description":"长度单位","bsonType":"string","title":"长度单位","trim":"both"},"dOrificeDtemp":{"description":"孔板内径参考温度","bsonType":"string","title":"孔板内径参考温度","trim":"both"},"dOrificeDtempUnit":{"description":"温度单位","bsonType":"string","title":"温度单位","trim":"both"},"dOrificeMaterial":{"description":"孔板材料","bsonType":"string","title":"孔板材料","trim":"both"},"dOrificeSharpness":{"description":"锐利度系数计算方法","bsonType":"string","title":"锐利度系数计算方法","trim":"both"},"dOrificeRk":{"description":"孔板入口圆弧半径","bsonType":"string","title":"孔板入口圆弧半径","trim":"both"},"dOrificeRkLenU":{"description":"长度单位","bsonType":"string","title":"长度单位","trim":"both"},"dPf":{"description":"输入压力","bsonType":"string","title":"输入压力","trim":"both"},"dPfUnit":{"description":"压力单位","bsonType":"string","title":"压力单位","trim":"both"},"dPfType":{"description":"压力类型","bsonType":"string","title":"压力类型","trim":"both"},"dTf":{"description":"输入温度","bsonType":"string","title":"输入温度","trim":"both"},"dTfUnit":{"description":"温度单位","bsonType":"string","title":"温度单位","trim":"both"},"dDp":{"description":"输入差压","bsonType":"string","title":"输入差压","trim":"both"},"dDpUnit":{"description":"压力单位","bsonType":"string","title":"压力单位","trim":"both"},"dVFlowUnit":{"description":"体积流量单位","bsonType":"string","title":"体积流量单位","trim":"both"},"dMFlowUnit":{"description":"质量流量单位","bsonType":"string","title":"质量流量单位","trim":"both"},"dEFlowUnit":{"description":"能量流量单位","bsonType":"string","title":"能量流量单位","trim":"both"},"dCdCalMethod":{"description":"流出系数计算方法","bsonType":"string","title":"流出系数计算方法","trim":"both"},"dMeterFactor":{"description":"仪表系数","bsonType":"string","title":"仪表系数","trim":"both"},"dPulseNum":{"description":"脉冲数","bsonType":"string","title":"脉冲数","trim":"both"},"dVFlowMax":{"description":"最大体积流量","bsonType":"string","title":"最大体积流量","trim":"both"},"dVFlowMin":{"description":"最小体积流量","bsonType":"string","title":"最小体积流量","trim":"both"},"dVFlowCon":{"description":"常用流量","bsonType":"string","title":"常用流量","trim":"both"},"dPfRangeMin":{"description":"压力量程","bsonType":"string","title":"压力量程","trim":"both"},"dPfRangeMax":{"description":"压力量程","bsonType":"string","title":"压力量程","trim":"both"},"dDpRangeMin":{"description":"差压量程","bsonType":"string","title":"差压量程","trim":"both"},"dDpRangeMax":{"description":"差压量程","bsonType":"string","title":"差压量程","trim":"both"},"dTfRangeMin":{"description":"温度计量程","bsonType":"string","title":"温度计量程","trim":"both"},"dTfRangeMax":{"description":"温度计量程","bsonType":"string","title":"温度计量程","trim":"both"},"dVGsc":{"description":"管束车水容积","bsonType":"string","title":"管束车水容积","trim":"both"}}}
\ No newline at end of file
+{
+	"bsonType": "object",
+	"required": [],
+	"permission": {
+		"read": false,
+		"create": false,
+		"update": false,
+		"delete": false
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"createTime": {
+			"description": "创建时间",
+			"bsonType": "datetime",
+			"title": "创建时间",
+			"trim": "both"
+		},
+		"createBy": {
+			"description": "创建人",
+			"bsonType": "string",
+			"title": "创建人",
+			"trim": "both"
+		},
+		"updateTime": {
+			"description": "更新时间",
+			"bsonType": "datetime",
+			"title": "更新时间",
+			"trim": "both"
+		},
+		"updateBy": {
+			"description": "更新人",
+			"bsonType": "string",
+			"title": "更新人",
+			"trim": "both"
+		},
+		"meterID": {
+			"description": "计量点编号",
+			"bsonType": "string",
+			"title": "计量点编号",
+			"trim": "both"
+		},
+		"dFlowCalbz": {
+			"description": "流量计算标准",
+			"bsonType": "string",
+			"title": "流量计算标准",
+			"trim": "both"
+		},
+		"dZcalbz": {
+			"description": "压缩因子计算标准",
+			"bsonType": "string",
+			"title": "压缩因子计算标准",
+			"trim": "both"
+		},
+		"dCbtj": {
+			"description": "计量参比条件",
+			"bsonType": "string",
+			"title": "计量参比条件",
+			"trim": "both"
+		},
+		"dRsCbtj": {
+			"description": "燃烧参比条件",
+			"bsonType": "string",
+			"title": "燃烧参比条件",
+			"trim": "both"
+		},
+		"dPb_M": {
+			"description": "计量参比条件压力",
+			"bsonType": "string",
+			"title": "计量参比条件压力",
+			"trim": "both"
+		},
+		"dTb_M": {
+			"description": "计量参比条件温度",
+			"bsonType": "string",
+			"title": "计量参比条件温度",
+			"trim": "both"
+		},
+		"dPb_E": {
+			"description": "燃烧参比条件压力",
+			"bsonType": "string",
+			"title": "燃烧参比条件压力",
+			"trim": "both"
+		},
+		"dTb_E": {
+			"description": "燃烧参比条件温度",
+			"bsonType": "string",
+			"title": "燃烧参比条件温度",
+			"trim": "both"
+		},
+		"dPatm": {
+			"description": "当地大气压",
+			"bsonType": "string",
+			"title": "当地大气压",
+			"trim": "both"
+		},
+		"dPatmUnit": {
+			"description": "当地大气压单位",
+			"bsonType": "string",
+			"title": "当地大气压单位",
+			"trim": "both"
+		},
+		"dNG_Compents": {
+			"description": "天然气组分",
+			"bsonType": "string",
+			"title": "天然气组分",
+			"trim": "both"
+		},
+		"dMeterType": {
+			"description": "流量计类别",
+			"bsonType": "string",
+			"title": "流量计类别",
+			"trim": "both"
+		},
+		"dCoreType": {
+			"description": "节流装置类型",
+			"bsonType": "string",
+			"title": "节流装置类型",
+			"trim": "both"
+		},
+		"dPtmode": {
+			"description": "取压方式",
+			"bsonType": "string",
+			"title": "取压方式",
+			"trim": "both"
+		},
+		"dPipeType": {
+			"description": "管道类型",
+			"bsonType": "string",
+			"title": "管道类型",
+			"trim": "both"
+		},
+		"dPipeD": {
+			"description": "管道内径",
+			"bsonType": "string",
+			"title": "管道内径",
+			"trim": "both"
+		},
+		"dLenUnit": {
+			"description": "长度单位",
+			"bsonType": "string",
+			"title": "长度单位",
+			"trim": "both"
+		},
+		"dPipeDtemp": {
+			"description": "管道内径参考温度",
+			"bsonType": "string",
+			"title": "管道内径参考温度",
+			"trim": "both"
+		},
+		"dPileDtempU": {
+			"description": "温度单位",
+			"bsonType": "string",
+			"title": "温度单位",
+			"trim": "both"
+		},
+		"dPipeMaterial": {
+			"description": "管道材料",
+			"bsonType": "string",
+			"title": "管道材料",
+			"trim": "both"
+		},
+		"dOrificeD": {
+			"description": "孔板孔径",
+			"bsonType": "string",
+			"title": "孔板孔径",
+			"trim": "both"
+		},
+		"dOrificeUnit": {
+			"description": "长度单位",
+			"bsonType": "string",
+			"title": "长度单位",
+			"trim": "both"
+		},
+		"dOrificeDtemp": {
+			"description": "孔板内径参考温度",
+			"bsonType": "string",
+			"title": "孔板内径参考温度",
+			"trim": "both"
+		},
+		"dOrificeDtempUnit": {
+			"description": "温度单位",
+			"bsonType": "string",
+			"title": "温度单位",
+			"trim": "both"
+		},
+		"dOrificeMaterial": {
+			"description": "孔板材料",
+			"bsonType": "string",
+			"title": "孔板材料",
+			"trim": "both"
+		},
+		"dOrificeSharpness": {
+			"description": "锐利度系数计算方法",
+			"bsonType": "string",
+			"title": "锐利度系数计算方法",
+			"trim": "both"
+		},
+		"dOrificeRk": {
+			"description": "孔板入口圆弧半径",
+			"bsonType": "string",
+			"title": "孔板入口圆弧半径",
+			"trim": "both"
+		},
+		"dOrificeRkLenU": {
+			"description": "长度单位",
+			"bsonType": "string",
+			"title": "长度单位",
+			"trim": "both"
+		},
+		"dPf": {
+			"description": "输入压力",
+			"bsonType": "string",
+			"title": "输入压力",
+			"trim": "both"
+		},
+		"dPfUnit": {
+			"description": "压力单位",
+			"bsonType": "string",
+			"title": "压力单位",
+			"trim": "both"
+		},
+		"dPfType": {
+			"description": "压力类型",
+			"bsonType": "string",
+			"title": "压力类型",
+			"trim": "both"
+		},
+		"dTf": {
+			"description": "输入温度",
+			"bsonType": "string",
+			"title": "输入温度",
+			"trim": "both"
+		},
+		"dTfUnit": {
+			"description": "温度单位",
+			"bsonType": "string",
+			"title": "温度单位",
+			"trim": "both"
+		},
+		"dDp": {
+			"description": "输入差压",
+			"bsonType": "string",
+			"title": "输入差压",
+			"trim": "both"
+		},
+		"dDpUnit": {
+			"description": "压力单位",
+			"bsonType": "string",
+			"title": "压力单位",
+			"trim": "both"
+		},
+		"dVFlowUnit": {
+			"description": "体积流量单位",
+			"bsonType": "string",
+			"title": "体积流量单位",
+			"trim": "both"
+		},
+		"dMFlowUnit": {
+			"description": "质量流量单位",
+			"bsonType": "string",
+			"title": "质量流量单位",
+			"trim": "both"
+		},
+		"dEFlowUnit": {
+			"description": "能量流量单位",
+			"bsonType": "string",
+			"title": "能量流量单位",
+			"trim": "both"
+		},
+		"dCdCalMethod": {
+			"description": "流出系数计算方法",
+			"bsonType": "string",
+			"title": "流出系数计算方法",
+			"trim": "both"
+		},
+		"dMeterFactor": {
+			"description": "仪表系数",
+			"bsonType": "string",
+			"title": "仪表系数",
+			"trim": "both"
+		},
+		"dPulseNum": {
+			"description": "脉冲数",
+			"bsonType": "string",
+			"title": "脉冲数",
+			"trim": "both"
+		},
+		"dVFlowMax": {
+			"description": "最大体积流量",
+			"bsonType": "string",
+			"title": "最大体积流量",
+			"trim": "both"
+		},
+		"dVFlowMin": {
+			"description": "最小体积流量",
+			"bsonType": "string",
+			"title": "最小体积流量",
+			"trim": "both"
+		},
+		"dVFlowCon": {
+			"description": "常用流量",
+			"bsonType": "string",
+			"title": "常用流量",
+			"trim": "both"
+		},
+		"dPfRangeMin": {
+			"description": "压力量程",
+			"bsonType": "string",
+			"title": "压力量程",
+			"trim": "both"
+		},
+		"dPfRangeMax": {
+			"description": "压力量程",
+			"bsonType": "string",
+			"title": "压力量程",
+			"trim": "both"
+		},
+		"dDpRangeMin": {
+			"description": "差压量程",
+			"bsonType": "string",
+			"title": "差压量程",
+			"trim": "both"
+		},
+		"dDpRangeMax": {
+			"description": "差压量程",
+			"bsonType": "string",
+			"title": "差压量程",
+			"trim": "both"
+		},
+		"dTfRangeMin": {
+			"description": "温度计量程",
+			"bsonType": "string",
+			"title": "温度计量程",
+			"trim": "both"
+		},
+		"dTfRangeMax": {
+			"description": "温度计量程",
+			"bsonType": "string",
+			"title": "温度计量程",
+			"trim": "both"
+		},
+		"dVGsc": {
+			"description": "管束车水容积",
+			"bsonType": "string",
+			"title": "管束车水容积",
+			"trim": "both"
+		}
+	}
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/uni-id-users.schema.json b/uniCloud-aliyun/database/uni-id-users.schema.json
index 9c848e1..cae65e9 100644
--- a/uniCloud-aliyun/database/uni-id-users.schema.json
+++ b/uniCloud-aliyun/database/uni-id-users.schema.json
@@ -1 +1,442 @@
-{"bsonType":"object","required":[],"permission":{"read":true,"create":true,"update":true,"delete":true},"properties":{"_id":{"description":"存储文档 ID（用户 ID），系统自动生成"},"username":{"bsonType":"string","title":"用户名","description":"用户名，不允许重复","trim":"both"},"password":{"bsonType":"password","title":"密码","description":"密码，加密存储","trim":"both"},"password_secret_version":{"bsonType":"int","title":"passwordSecret","description":"密码使用的passwordSecret版本"},"nickname":{"bsonType":"string","title":"昵称","description":"用户昵称","trim":"both"},"gender":{"bsonType":"int","title":"性别","description":"用户性别：0 未知 1 男性 2 女性","defaultValue":0,"enum":[{"text":"未知","value":0},{"text":"男","value":1},{"text":"女","value":2}]},"status":{"bsonType":"int","description":"用户状态：0 正常 1 禁用 2 审核中 3 审核拒绝","title":"用户状态","defaultValue":0,"enum":[{"text":"正常","value":0},{"text":"禁用","value":1},{"text":"审核中","value":2},{"text":"审核拒绝","value":3}]},"mobile":{"bsonType":"string","title":"手机号码","description":"手机号码","pattern":"^\\+?[0-9-]{3,20}$","trim":"both"},"mobile_confirmed":{"bsonType":"int","description":"手机号验证状态：0 未验证 1 已验证","title":"手机号验证状态","defaultValue":0,"enum":[{"text":"未验证","value":0},{"text":"已验证","value":1}]},"email":{"bsonType":"string","format":"email","title":"邮箱","description":"邮箱地址","trim":"both"},"email_confirmed":{"bsonType":"int","description":"邮箱验证状态：0 未验证 1 已验证","title":"邮箱验证状态","defaultValue":0,"enum":[{"text":"未验证","value":0},{"text":"已验证","value":1}]},"avatar":{"bsonType":"string","title":"头像地址","description":"头像地址","trim":"both"},"avatar_file":{"bsonType":"file","title":"头像文件","description":"用file类型方便使用uni-file-picker组件"},"d_ids":{"bsonType":"array","description":"部门ID","title":"部门","foreignKey":"opendb-department._id","enumType":"tree","enum":{"collection":"opendb-department","orderby":"name asc","field":"_id as value, name as text"}},"e_ids":{"bsonType":"array","description":"企业ID","title":"企业"},"role":{"bsonType":"array","title":"角色","description":"用户角色","enum":{"collection":"uni-id-roles","field":"role_id as value, role_name as text"},"foreignKey":"uni-id-roles.role_id","permission":{"write":false}},"wx_unionid":{"bsonType":"string","description":"微信unionid"},"wx_openid":{"bsonType":"object","description":"微信各个平台openid","properties":{"app":{"bsonType":"string","description":"app平台微信openid"},"mp":{"bsonType":"string","description":"微信小程序平台openid"},"h5":{"bsonType":"string","description":"微信公众号平台openid"},"web":{"bsonType":"string","description":"微信网页登录openid"}}},"ali_openid":{"bsonType":"string","description":"支付宝平台openid"},"apple_openid":{"bsonType":"string","description":"苹果登录openid"},"dcloud_appid":{"bsonType":"array","description":"允许登录的客户端的appid列表","foreignKey":"opendb-app-list.appid"},"comment":{"bsonType":"string","title":"备注","description":"备注","trim":"both"},"third_party":{"bsonType":"object","description":"缓存用户在三方平台的token等信息","properties":{"mp_weixin":{"bsonType":"object","description":"微信小程序相关信息","properties":{"session_key":{"bsonType":"string","description":"微信小程序session key"}}},"app_weixin":{"bsonType":"object","description":"app平台微信相关信息","properties":{"access_token":{"bsonType":"string","description":"app平台微信access token"},"access_token_expired":{"bsonType":"string","description":"app平台微信access token过期时间"},"refresh_token":{"bsonType":"string","description":"app平台微信refresh token"}}},"h5_weixin":{"bsonType":"object","description":"微信公众号平台微信相关信息","properties":{"access_token":{"bsonType":"string","description":"微信公众号平台access token"},"access_token_expired":{"bsonType":"string","description":"微信公众号平台access token过期时间"},"refresh_token":{"bsonType":"string","description":"微信公众号平台refresh token"}}},"web_weixin":{"bsonType":"object","description":"web平台微信相关信息","properties":{"access_token":{"bsonType":"string","description":"web平台微信access token"},"access_token_expired":{"bsonType":"string","description":"web平台微信access token过期时间"},"refresh_token":{"bsonType":"string","description":"web平台微信refresh token"}}},"mp_qq":{"bsonType":"object","description":"QQ小程序相关信息","properties":{"session_key":{"bsonType":"string","description":"QQ小程序session key"}}},"app_qq":{"bsonType":"object","description":"app平台QQ相关信息","properties":{"access_token":{"bsonType":"string","description":"app平台QQ access token"},"access_token_expired":{"bsonType":"string","description":"app平台QQ access token过期时间"}}}}},"register_env":{"bsonType":"object","description":"注册环境信息","properties":{"appid":{"bsonType":"string","description":"注册时的应用AppId"},"uni_platform":{"bsonType":"string","description":"注册时的应用平台，app、h5等"},"os_name":{"bsonType":"string","description":"注册时的客户端系统类型，ios、android、windows、mac、linux"},"app_name":{"bsonType":"string","description":"注册时的应用名称"},"app_version":{"bsonType":"string","description":"注册时的应用版本名称"},"app_version_code":{"bsonType":"string","description":"注册时的应用版本号码"},"channel":{"bsonType":"string","description":"注册时的应用渠道或小程序启动场景"},"client_ip":{"bsonType":"string","description":"注册时的客户端ip"}}},"realname_auth":{"bsonType":"object","description":"实名认证信息","required":["type","auth_status"],"properties":{"type":{"bsonType":"int","minimum":0,"maximum":1,"description":"用户类型：0 个人用户 1 企业用户"},"auth_status":{"bsonType":"int","minimum":0,"maximum":3,"description":"认证状态：0 未认证 1 等待认证 2 认证通过 3 认证失败"},"auth_date":{"bsonType":"timestamp","description":"认证通过时间"},"real_name":{"bsonType":"string","description":"真实姓名\/企业名称"},"identity":{"bsonType":"string","description":"身份证号码\/营业执照号码"},"id_card_front":{"bsonType":"string","description":"身份证正面照 URL"},"id_card_back":{"bsonType":"string","description":"身份证反面照 URL"},"in_hand":{"bsonType":"string","description":"手持身份证照片 URL"},"license":{"bsonType":"string","description":"营业执照 URL"},"contact_person":{"bsonType":"string","description":"联系人姓名"},"contact_mobile":{"bsonType":"string","description":"联系人手机号码"},"contact_email":{"bsonType":"string","description":"联系人邮箱"}}},"score":{"bsonType":"int","description":"用户积分，积分变更记录可参考：uni-id-scores表定义"},"register_date":{"bsonType":"timestamp","description":"注册时间","forceDefaultValue":{"$env":"now"}},"register_ip":{"bsonType":"string","description":"注册时 IP 地址","forceDefaultValue":{"$env":"clientIP"}},"last_login_date":{"bsonType":"timestamp","description":"最后登录时间"},"last_login_ip":{"bsonType":"string","description":"最后登录时 IP 地址"},"token":{"bsonType":"array","description":"用户token"},"inviter_uid":{"bsonType":"array","description":"用户全部上级邀请者","trim":"both"},"invite_time":{"bsonType":"timestamp","description":"受邀时间"},"my_invite_code":{"bsonType":"string","description":"用户自身邀请码"},"identities":{"bsonType":"array","description":"三方平台身份信息；一个对象代表一个身份，参数支持: provider 身份源, userInfo 三方用户信息, openid 三方openid, unionid 三方unionid, uid 三方uid","permission":{"read":"'READ_UNI_ID_USERS' in auth.permission","write":"'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"}}},"version":"1.0.3"}
\ No newline at end of file
+{
+	"bsonType": "object",
+	"required": [],
+	"permission": {
+		"read": true,
+		"create": true,
+		"update": true,
+		"delete": true
+	},
+	"properties": {
+		"_id": {
+			"description": "存储文档 ID（用户 ID），系统自动生成"
+		},
+		"username": {
+			"bsonType": "string",
+			"title": "用户名",
+			"description": "用户名，不允许重复",
+			"trim": "both"
+		},
+		"password": {
+			"bsonType": "password",
+			"title": "密码",
+			"description": "密码，加密存储",
+			"trim": "both"
+		},
+		"password_secret_version": {
+			"bsonType": "int",
+			"title": "passwordSecret",
+			"description": "密码使用的passwordSecret版本"
+		},
+		"nickname": {
+			"bsonType": "string",
+			"title": "昵称",
+			"description": "用户昵称",
+			"trim": "both"
+		},
+		"gender": {
+			"bsonType": "int",
+			"title": "性别",
+			"description": "用户性别：0 未知 1 男性 2 女性",
+			"defaultValue": 0,
+			"enum": [{
+				"text": "未知",
+				"value": 0
+			}, {
+				"text": "男",
+				"value": 1
+			}, {
+				"text": "女",
+				"value": 2
+			}]
+		},
+		"status": {
+			"bsonType": "int",
+			"description": "用户状态：0 正常 1 禁用 2 审核中 3 审核拒绝",
+			"title": "用户状态",
+			"defaultValue": 0,
+			"enum": [{
+				"text": "正常",
+				"value": 0
+			}, {
+				"text": "禁用",
+				"value": 1
+			}, {
+				"text": "审核中",
+				"value": 2
+			}, {
+				"text": "审核拒绝",
+				"value": 3
+			}]
+		},
+		"mobile": {
+			"bsonType": "string",
+			"title": "手机号码",
+			"description": "手机号码",
+			"pattern": "^\\+?[0-9-]{3,20}$",
+			"trim": "both"
+		},
+		"mobile_confirmed": {
+			"bsonType": "int",
+			"description": "手机号验证状态：0 未验证 1 已验证",
+			"title": "手机号验证状态",
+			"defaultValue": 0,
+			"enum": [{
+				"text": "未验证",
+				"value": 0
+			}, {
+				"text": "已验证",
+				"value": 1
+			}]
+		},
+		"email": {
+			"bsonType": "string",
+			"format": "email",
+			"title": "邮箱",
+			"description": "邮箱地址",
+			"trim": "both"
+		},
+		"email_confirmed": {
+			"bsonType": "int",
+			"description": "邮箱验证状态：0 未验证 1 已验证",
+			"title": "邮箱验证状态",
+			"defaultValue": 0,
+			"enum": [{
+				"text": "未验证",
+				"value": 0
+			}, {
+				"text": "已验证",
+				"value": 1
+			}]
+		},
+		"avatar": {
+			"bsonType": "string",
+			"title": "头像地址",
+			"description": "头像地址",
+			"trim": "both"
+		},
+		"avatar_file": {
+			"bsonType": "file",
+			"title": "头像文件",
+			"description": "用file类型方便使用uni-file-picker组件"
+		},
+		"d_ids": {
+			"bsonType": "array",
+			"description": "部门ID",
+			"title": "部门",
+			"foreignKey": "opendb-department._id",
+			"enumType": "tree",
+			"enum": {
+				"collection": "opendb-department",
+				"orderby": "name asc",
+				"field": "_id as value, name as text"
+			}
+		},
+		"e_ids": {
+			"bsonType": "array",
+			"description": "企业ID",
+			"title": "企业"
+		},
+		"role": {
+			"bsonType": "array",
+			"title": "角色",
+			"description": "用户角色",
+			"enum": {
+				"collection": "uni-id-roles",
+				"field": "role_id as value, role_name as text"
+			},
+			"foreignKey": "uni-id-roles.role_id",
+			"permission": {
+				"write": false
+			}
+		},
+		"wx_unionid": {
+			"bsonType": "string",
+			"description": "微信unionid"
+		},
+		"wx_openid": {
+			"bsonType": "object",
+			"description": "微信各个平台openid",
+			"properties": {
+				"app": {
+					"bsonType": "string",
+					"description": "app平台微信openid"
+				},
+				"mp": {
+					"bsonType": "string",
+					"description": "微信小程序平台openid"
+				},
+				"h5": {
+					"bsonType": "string",
+					"description": "微信公众号平台openid"
+				},
+				"web": {
+					"bsonType": "string",
+					"description": "微信网页登录openid"
+				}
+			}
+		},
+		"ali_openid": {
+			"bsonType": "string",
+			"description": "支付宝平台openid"
+		},
+		"apple_openid": {
+			"bsonType": "string",
+			"description": "苹果登录openid"
+		},
+		"dcloud_appid": {
+			"bsonType": "array",
+			"description": "允许登录的客户端的appid列表",
+			"foreignKey": "opendb-app-list.appid"
+		},
+		"comment": {
+			"bsonType": "string",
+			"title": "备注",
+			"description": "备注",
+			"trim": "both"
+		},
+		"third_party": {
+			"bsonType": "object",
+			"description": "缓存用户在三方平台的token等信息",
+			"properties": {
+				"mp_weixin": {
+					"bsonType": "object",
+					"description": "微信小程序相关信息",
+					"properties": {
+						"session_key": {
+							"bsonType": "string",
+							"description": "微信小程序session key"
+						}
+					}
+				},
+				"app_weixin": {
+					"bsonType": "object",
+					"description": "app平台微信相关信息",
+					"properties": {
+						"access_token": {
+							"bsonType": "string",
+							"description": "app平台微信access token"
+						},
+						"access_token_expired": {
+							"bsonType": "string",
+							"description": "app平台微信access token过期时间"
+						},
+						"refresh_token": {
+							"bsonType": "string",
+							"description": "app平台微信refresh token"
+						}
+					}
+				},
+				"h5_weixin": {
+					"bsonType": "object",
+					"description": "微信公众号平台微信相关信息",
+					"properties": {
+						"access_token": {
+							"bsonType": "string",
+							"description": "微信公众号平台access token"
+						},
+						"access_token_expired": {
+							"bsonType": "string",
+							"description": "微信公众号平台access token过期时间"
+						},
+						"refresh_token": {
+							"bsonType": "string",
+							"description": "微信公众号平台refresh token"
+						}
+					}
+				},
+				"web_weixin": {
+					"bsonType": "object",
+					"description": "web平台微信相关信息",
+					"properties": {
+						"access_token": {
+							"bsonType": "string",
+							"description": "web平台微信access token"
+						},
+						"access_token_expired": {
+							"bsonType": "string",
+							"description": "web平台微信access token过期时间"
+						},
+						"refresh_token": {
+							"bsonType": "string",
+							"description": "web平台微信refresh token"
+						}
+					}
+				},
+				"mp_qq": {
+					"bsonType": "object",
+					"description": "QQ小程序相关信息",
+					"properties": {
+						"session_key": {
+							"bsonType": "string",
+							"description": "QQ小程序session key"
+						}
+					}
+				},
+				"app_qq": {
+					"bsonType": "object",
+					"description": "app平台QQ相关信息",
+					"properties": {
+						"access_token": {
+							"bsonType": "string",
+							"description": "app平台QQ access token"
+						},
+						"access_token_expired": {
+							"bsonType": "string",
+							"description": "app平台QQ access token过期时间"
+						}
+					}
+				}
+			}
+		},
+		"register_env": {
+			"bsonType": "object",
+			"description": "注册环境信息",
+			"properties": {
+				"appid": {
+					"bsonType": "string",
+					"description": "注册时的应用AppId"
+				},
+				"uni_platform": {
+					"bsonType": "string",
+					"description": "注册时的应用平台，app、h5等"
+				},
+				"os_name": {
+					"bsonType": "string",
+					"description": "注册时的客户端系统类型，ios、android、windows、mac、linux"
+				},
+				"app_name": {
+					"bsonType": "string",
+					"description": "注册时的应用名称"
+				},
+				"app_version": {
+					"bsonType": "string",
+					"description": "注册时的应用版本名称"
+				},
+				"app_version_code": {
+					"bsonType": "string",
+					"description": "注册时的应用版本号码"
+				},
+				"channel": {
+					"bsonType": "string",
+					"description": "注册时的应用渠道或小程序启动场景"
+				},
+				"client_ip": {
+					"bsonType": "string",
+					"description": "注册时的客户端ip"
+				}
+			}
+		},
+		"realname_auth": {
+			"bsonType": "object",
+			"description": "实名认证信息",
+			"required": ["type", "auth_status"],
+			"properties": {
+				"type": {
+					"bsonType": "int",
+					"minimum": 0,
+					"maximum": 1,
+					"description": "用户类型：0 个人用户 1 企业用户"
+				},
+				"auth_status": {
+					"bsonType": "int",
+					"minimum": 0,
+					"maximum": 3,
+					"description": "认证状态：0 未认证 1 等待认证 2 认证通过 3 认证失败"
+				},
+				"auth_date": {
+					"bsonType": "timestamp",
+					"description": "认证通过时间"
+				},
+				"real_name": {
+					"bsonType": "string",
+					"description": "真实姓名\/企业名称"
+				},
+				"identity": {
+					"bsonType": "string",
+					"description": "身份证号码\/营业执照号码"
+				},
+				"id_card_front": {
+					"bsonType": "string",
+					"description": "身份证正面照 URL"
+				},
+				"id_card_back": {
+					"bsonType": "string",
+					"description": "身份证反面照 URL"
+				},
+				"in_hand": {
+					"bsonType": "string",
+					"description": "手持身份证照片 URL"
+				},
+				"license": {
+					"bsonType": "string",
+					"description": "营业执照 URL"
+				},
+				"contact_person": {
+					"bsonType": "string",
+					"description": "联系人姓名"
+				},
+				"contact_mobile": {
+					"bsonType": "string",
+					"description": "联系人手机号码"
+				},
+				"contact_email": {
+					"bsonType": "string",
+					"description": "联系人邮箱"
+				}
+			}
+		},
+		"score": {
+			"bsonType": "int",
+			"description": "用户积分，积分变更记录可参考：uni-id-scores表定义"
+		},
+		"register_date": {
+			"bsonType": "timestamp",
+			"description": "注册时间",
+			"forceDefaultValue": {
+				"$env": "now"
+			}
+		},
+		"register_ip": {
+			"bsonType": "string",
+			"description": "注册时 IP 地址",
+			"forceDefaultValue": {
+				"$env": "clientIP"
+			}
+		},
+		"last_login_date": {
+			"bsonType": "timestamp",
+			"description": "最后登录时间"
+		},
+		"last_login_ip": {
+			"bsonType": "string",
+			"description": "最后登录时 IP 地址"
+		},
+		"token": {
+			"bsonType": "array",
+			"description": "用户token"
+		},
+		"inviter_uid": {
+			"bsonType": "array",
+			"description": "用户全部上级邀请者",
+			"trim": "both"
+		},
+		"invite_time": {
+			"bsonType": "timestamp",
+			"description": "受邀时间"
+		},
+		"my_invite_code": {
+			"bsonType": "string",
+			"description": "用户自身邀请码"
+		},
+		"identities": {
+			"bsonType": "array",
+			"description": "三方平台身份信息；一个对象代表一个身份，参数支持: provider 身份源, userInfo 三方用户信息, openid 三方openid, unionid 三方unionid, uid 三方uid",
+			"permission": {
+				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			}
+		}
+	},
+	"version": "1.0.3"
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/uni-stat-error-logs.schema.json b/uniCloud-aliyun/database/uni-stat-error-logs.schema.json
index 2a22612..61ae1f6 100644
--- a/uniCloud-aliyun/database/uni-stat-error-logs.schema.json
+++ b/uniCloud-aliyun/database/uni-stat-error-logs.schema.json
@@ -1 +1,102 @@
-{"bsonType":"object","description":"记录上报的应用运行错误日志","required":[],"permission":{"read":false,"create":false,"update":false,"delete":false},"properties":{"_id":{"description":"ID，系统自动生成"},"appid":{"bsonType":"string","description":"用户端上报的应用ID"},"version":{"bsonType":"string","description":"用户端上报的应用版本号"},"platform":{"bsonType":"string","description":"用户端上报的平台code"},"channel":{"bsonType":"string","description":"用户端上报的渠道code\/场景值"},"error_type":{"bsonType":"int","description":"错误类型","defaultValue":0,"enum":[{"text":"未知","value":0},{"text":"表示webview页面js异常（uni-app项目对应vue页面）","value":2},{"text":"表示uni框架js异常（仅uni-app项目）","value":4},{"text":"表示控制页js异常（仅uni-app项目）","value":5},{"text":"表示nvue页面js异常（仅uni-app项目）","value":6}]},"device_id":{"bsonType":"string","description":"客户端携带的设备标识"},"uid":{"bsonType":"string","description":"用户编号, 对应uni-id-users._id"},"os":{"bsonType":"string","description":"客户端操作系统"},"ua":{"bsonType":"string","description":"客户端user-agent信息"},"space_id":{"bsonType":"string","description":"服务空间编号"},"space_provider":{"bsonType":"string","description":"服务空间提供商"},"sdk_version":{"bsonType":"string","description":"小程序基础库版本号"},"platform_version":{"bsonType":"string","description":"微信、支付宝宿主App的版本号"},"error_msg":{"bsonType":"string","description":"错误信息"},"error_hash":{"bsonType":"string","description":"错误hash码"},"page_url":{"bsonType":"string","description":"页面url"},"create_time":{"bsonType":"timestamp","description":"创建时间"}},"version":"0.0.2"}
\ No newline at end of file
+{
+	"bsonType": "object",
+	"description": "记录上报的应用运行错误日志",
+	"required": [],
+	"permission": {
+		"read": false,
+		"create": false,
+		"update": false,
+		"delete": false
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"appid": {
+			"bsonType": "string",
+			"description": "用户端上报的应用ID"
+		},
+		"version": {
+			"bsonType": "string",
+			"description": "用户端上报的应用版本号"
+		},
+		"platform": {
+			"bsonType": "string",
+			"description": "用户端上报的平台code"
+		},
+		"channel": {
+			"bsonType": "string",
+			"description": "用户端上报的渠道code\/场景值"
+		},
+		"error_type": {
+			"bsonType": "int",
+			"description": "错误类型",
+			"defaultValue": 0,
+			"enum": [{
+				"text": "未知",
+				"value": 0
+			}, {
+				"text": "表示webview页面js异常（uni-app项目对应vue页面）",
+				"value": 2
+			}, {
+				"text": "表示uni框架js异常（仅uni-app项目）",
+				"value": 4
+			}, {
+				"text": "表示控制页js异常（仅uni-app项目）",
+				"value": 5
+			}, {
+				"text": "表示nvue页面js异常（仅uni-app项目）",
+				"value": 6
+			}]
+		},
+		"device_id": {
+			"bsonType": "string",
+			"description": "客户端携带的设备标识"
+		},
+		"uid": {
+			"bsonType": "string",
+			"description": "用户编号, 对应uni-id-users._id"
+		},
+		"os": {
+			"bsonType": "string",
+			"description": "客户端操作系统"
+		},
+		"ua": {
+			"bsonType": "string",
+			"description": "客户端user-agent信息"
+		},
+		"space_id": {
+			"bsonType": "string",
+			"description": "服务空间编号"
+		},
+		"space_provider": {
+			"bsonType": "string",
+			"description": "服务空间提供商"
+		},
+		"sdk_version": {
+			"bsonType": "string",
+			"description": "小程序基础库版本号"
+		},
+		"platform_version": {
+			"bsonType": "string",
+			"description": "微信、支付宝宿主App的版本号"
+		},
+		"error_msg": {
+			"bsonType": "string",
+			"description": "错误信息"
+		},
+		"error_hash": {
+			"bsonType": "string",
+			"description": "错误hash码"
+		},
+		"page_url": {
+			"bsonType": "string",
+			"description": "页面url"
+		},
+		"create_time": {
+			"bsonType": "timestamp",
+			"description": "创建时间"
+		}
+	},
+	"version": "0.0.2"
+}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/uni-stat-error-result.schema.json b/uniCloud-aliyun/database/uni-stat-error-result.schema.json
index d13451d..ea9a2ea 100644
--- a/uniCloud-aliyun/database/uni-stat-error-result.schema.json
+++ b/uniCloud-aliyun/database/uni-stat-error-result.schema.json
@@ -1 +1,96 @@
-{"bsonType":"object","description":"存储汇总的错误日志的数据","required":[],"permission":{"read":false,"create":false,"update":false,"delete":false},"properties":{"_id":{"description":"ID，系统自动生成"},"appid":{"bsonType":"string","description":"应用ID"},"platform_id":{"bsonType":"string","description":"应用平台ID，对应uni-stat-app-platforms._id","foreignKey":"uni-stat-app-platforms._id"},"channel_id":{"bsonType":"string","description":"渠道\/场景值ID，对应uni-stat-app-channels._id","foreignKey":"uni-stat-app-channels._id"},"version_id":{"bsonType":"string","description":"应用版本ID，对应opendb-app-versions._id","foreignKey":"opendb-app-versions._id"},"type":{"bsonType":"string","description":"错误类型","enum":[{"text":"前端js错误","value":"js"},{"text":"原生应用崩溃错误","value":"crash"}]},"hash":{"bsonType":"string","description":"错误hash码"},"msg":{"bsonType":"string","description":"错误信息"},"count":{"bsonType":"int","description":"报错次数"},"app_launch_count":{"bsonType":"int","description":"本时间段App启动或从后台切到前台的次数"},"last_time":{"bsonType":"timestamp","description":"最近一次报错事件"},"dimension":{"bsonType":"string","description":"统计范围 day:按天统计，hour:按小时统计","enum":[{"text":"月","value":"month"},{"text":"周","value":"week"},{"text":"天","value":"day"},{"text":"小时","value":"hour"}]},"stat_date":{"bsonType":"int","description":"统计日期，格式yyyymmdd，例:20211201"},"start_time":{"bsonType":"timestamp","description":"开始时间"},"end_time":{"bsonType":"timestamp","description":"结束时间"}},"version":"0.0.2"}
\ No newline at end of file
+{
+	"bsonType": "object",
+	"description": "存储汇总的错误日志的数据",
+	"required": [],
+	"permission": {
+		"read": false,
+		"create": false,
+		"update": false,
+		"delete": false
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+		"appid": {
+			"bsonType": "string",
+			"description": "应用ID"
+		},
+		"platform_id": {
+			"bsonType": "string",
+			"description": "应用平台ID，对应uni-stat-app-platforms._id",
+			"foreignKey": "uni-stat-app-platforms._id"
+		},
+		"channel_id": {
+			"bsonType": "string",
+			"description": "渠道\/场景值ID，对应uni-stat-app-channels._id",
+			"foreignKey": "uni-stat-app-channels._id"
+		},
+		"version_id": {
+			"bsonType": "string",
+			"description": "应用版本ID，对应opendb-app-versions._id",
+			"foreignKey": "opendb-app-versions._id"
+		},
+		"type": {
+			"bsonType": "string",
+			"description": "错误类型",
+			"enum": [{
+				"text": "前端js错误",
+				"value": "js"
+			}, {
+				"text": "原生应用崩溃错误",
+				"value": "crash"
+			}]
+		},
+		"hash": {
+			"bsonType": "string",
+			"description": "错误hash码"
+		},
+		"msg": {
+			"bsonType": "string",
+			"description": "错误信息"
+		},
+		"count": {
+			"bsonType": "int",
+			"description": "报错次数"
+		},
+		"app_launch_count": {
+			"bsonType": "int",
+			"description": "本时间段App启动或从后台切到前台的次数"
+		},
+		"last_time": {
+			"bsonType": "timestamp",
+			"description": "最近一次报错事件"
+		},
+		"dimension": {
+			"bsonType": "string",
+			"description": "统计范围 day:按天统计，hour:按小时统计",
+			"enum": [{
+				"text": "月",
+				"value": "month"
+			}, {
+				"text": "周",
+				"value": "week"
+			}, {
+				"text": "天",
+				"value": "day"
+			}, {
+				"text": "小时",
+				"value": "hour"
+			}]
+		},
+		"stat_date": {
+			"bsonType": "int",
+			"description": "统计日期，格式yyyymmdd，例:20211201"
+		},
+		"start_time": {
+			"bsonType": "timestamp",
+			"description": "开始时间"
+		},
+		"end_time": {
+			"bsonType": "timestamp",
+			"description": "结束时间"
+		}
+	},
+	"version": "0.0.2"
+}
\ No newline at end of file
diff --git a/uni_modules/next-tree/components/next-tree/next-tree.vue b/uni_modules/next-tree/components/next-tree/next-tree.vue
new file mode 100644
index 0000000..5e47118
--- /dev/null
+++ b/uni_modules/next-tree/components/next-tree/next-tree.vue
@@ -0,0 +1,1034 @@
+<template>
+	<view class="next-tree">
+		<view class="next-tree-mask" :class="{'show':showTree}" @tap="_cancel"></view>
+		<view class="next-tree-cnt" :style="'top:'+top" :class="{'show':showTree, 'next-tree-cnt-page': uiMode === 'page'}">
+			<view v-if="_showTreeBar" class="next-tree-bar">
+				<view class="next-tree-bar-cancel" :style="{'color':cancelColor}" hover-class="hover-c" @tap="_cancel">取消</view>
+				<view class="next-tree-bar-title" :style="{'color':titleColor}">{{customTitle}}</view>
+				<view class="next-tree-bar-btns">
+					<view v-if="['checkbox', 'radio'].indexOf(funcMode) !== -1" class="next-tree-bar-cancel" :style="{'color':cancelColor}" hover-class="hover-c" @tap="_clear">清空</view>
+					<view v-else-if="funcMode === 'edit'" class="next-tree-bar-cancel" :style="{'color':cancelColor}" hover-class="hover-c" @tap="_revert">还原</view>
+					<view class="btn-divid"></view>
+					<view class="next-tree-bar-confirm" :style="{'color':_themeColor}" hover-class="hover-c" @tap="_confirm">确定</view>
+				</view>
+			</view>
+			<view class="next-tree-view" :style="'top:'+(_showTreeBar?'72rpx':'0rpx')">
+				<next-search-more v-if="ifSearch" @search="onSearch" mode="center" placeholder="请输入关键字" :isFixedSearchBtn="false" />
+				<slot name="topBar"></slot>
+				<scroll-view class="next-tree-view-sc" :scroll-y="true">
+					<view v-if="_treeList.length">	
+						<block v-for="(item, index) in _treeList" :key="index">
+							<view class="next-tree-item-block" v-if="item.show">
+								<view class="next-tree-item" :style="[{
+									paddingLeft: item.rank*15 + 'px',
+									zIndex: item.rank*-1 +50
+								}]"
+								 :class="{
+									border: border === true,
+									show: item.show,
+									last: item.lastRank,
+									showchild: item.showChild,
+									open: item.open,
+									disabled: item.disabled === true
+								}">
+									<block v-if="showAuxiliaryLine">
+										<template v-if="item.rank > 1">
+											<view :key="i" v-for="i in (item.rank - 1)" :style="{left: (6 * (2*i - 1) + 3 * (i - 1)) + 'px'}" class="parent-horizontal-line"></view>
+										</template>
+										<view class="left-line">
+											<view v-if="item.lastRank" class="horizontal-line"></view>
+										</view>
+									</block>
+									<view class="next-tree-label" @tap.stop="_treeItemTap(item, index)">
+										<image class="next-tree-icon" :src="item.lastRank ? lastIcon : item.showChild ? currentIcon : defaultIcon"></image>
+										<input @click.stop @tap.stop class="label-input" placeholder="请输入" v-if="funcMode === 'edit' && item.status === 'edit'" v-model="item.name" />
+										<rich-text :nodes="getNodes(item.ouputText)" :selectable="false" v-else-if="ifSearch && searchModel==='depHighlight' && keywords"></rich-text>
+										<slot v-else-if="$slots.label" name="label" :data="_getLabelSlotData(item)"></slot>
+										<rich-text v-else-if="item.checked && !item.disabled" :nodes="getThemeNodes(item.name)"></rich-text>
+										<text v-else>{{item.name}}</text>
+									</view>
+									<template v-if="['checkbox', 'radio'].indexOf(funcMode) !== -1">
+										<view class="next-tree-check" @tap.stop="_treeItemSelect(item, index)" v-if="selectParent === true ? true : item.lastRank">
+											<view class="next-tree-check-yes" v-if="item.checked" :class="{'radio':!multiple}" :style="{'border-color': item.disabled ? '#ccc' : _themeColor, 'background-color': item.disabled ? '#ccc' : _themeColor}">
+												<view class="next-tree-check-yes-b" :style="{'background-color':item.disabled ? '#ccc' : _themeColor}">
+													<text v-if="item.checked" class="icon-text">✔</text>
+												</view>
+											</view>
+											<view class="next-tree-check-no" v-else :class="{'radio':!multiple}" :style="{'border-color': item.disabled ? '#ccc' : _themeColor}">
+												<text v-if="showHalfChecked(item) && showHalfCheckedTips" :style="{'color': item.disabled ? '#ccc' : _themeColor, 'font-weight': 'blod', 'font-size': '10px'}" class="icon-text">一</text>
+											</view>
+										</view> 
+									</template>
+									<template v-else-if="funcMode === 'edit'">
+										<text v-if="item.status === 'loading'" :style="{'color': '#ccc'}" class="iconfont-loading icon-btn">&#xe629;</text>
+										<view v-else>
+											<text @click="_complete(item)" v-if="item.status === 'edit'" :style="{'color': item.disabled ? '#ccc' : _themeColor}" class="iconfont icon-btn">&#xe6cf;</text>
+											<template v-else>
+												<text  @click="_editItem(item)" :style="{'color': item.disabled ? '#ccc' : _themeColor}" class="iconfont icon-btn">&#xe66e;</text>
+												<text @click="_addSubItem(item)" :style="{'color': item.disabled ? '#ccc' : '#333'}" class="iconfont icon-btn">&#xe664;</text>
+												<text @click="_addSameItem(item)" :style="{'color': item.disabled ? '#ccc' : '#333'}" class="iconfont icon-btn">&#xe601;</text>
+											</template>
+											<text @click="_delItem(item)" :style="{'color': item.disabled ? '#ccc' : '#ff4d4f'}" class="iconfont icon-btn">&#xe602;</text>
+										</view>
+										
+									</template>
+								</view>
+							</view>
+						</block>
+					</view>
+					<view v-else>
+						<slot v-if="$slots.empty" name="empty"></slot>
+						<view class="empty" v-else><text>暂无数据</text></view>
+					</view>
+					<view v-if="ifSearch" style="height: 80rpx"></view>
+					<slot name="bottomBar"></slot>	
+				</scroll-view>
+			</view>
+		</view>
+		<view class="fixed-bottom-bar"><slot name="fixedBottomBar"></slot></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "next-tree",
+		props: {
+			uiMode: {
+				type: String,
+				default: 'popup' // popup(弹窗), page(页面)
+			},
+			funcMode: {
+				type: String,
+				default: 'radio' // display(展示模式), edit(编辑模式), checkbox(多选模式), radio(单选模式)
+			},
+			treeData: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			valueKey: {
+				type: String,
+				default: 'id'
+			},
+			labelKey: {
+				type: String,
+				default: 'label'
+			},
+			disabledKey: {
+				type: String,
+				default: 'disabled'
+			},
+			childrenKey: {
+				type: String,
+				default: 'children'
+			},
+			title: {
+				type: [String, Function],
+				default: ''
+			},
+			selectParent: { //是否可以选父级
+				type: Boolean,
+				default: false
+			},
+			foldAll: { //折叠时关闭所有已经打开的子集，再次打开时需要一级一级打开
+				type: Boolean,
+				default: false
+			},
+			themeColor: { // 主题颜色
+				type: String,
+				default: '#f9ae3d' // #f9ae3d
+			},
+			cancelColor: { // 取消按钮颜色
+				type: String,
+				default: '' // #757575
+			},
+			titleColor: { // 标题颜色
+				type: String,
+				default: '' // #757575
+			},
+			currentIcon: { // 展开时候的ic
+				type: String,
+				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFEAAABRCAYAAACqj0o2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MEQ0QTM0MzQ1Q0RBMTFFOUE0MjY4NzI1Njc1RjI1ODIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MEQ0QTM0MzU1Q0RBMTFFOUE0MjY4NzI1Njc1RjI1ODIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowRDRBMzQzMjVDREExMUU5QTQyNjg3MjU2NzVGMjU4MiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowRDRBMzQzMzVDREExMUU5QTQyNjg3MjU2NzVGMjU4MiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PidwepsAAAK0SURBVHja7JxbTsJAFIYHww7ciStgCeoGvGxAiOsgURegoL5720AXYLiIr0aJviq3Zx3PhIEnKG3ndtr+f3KixrSUj/ZjzjClIqUUiFm2gAAQAREQEUAEREAERAQQAREQAREBREAEREBEEqa67h9RFDWllDv0awWYlqlQHmu1WjMRRMoV1QFttA12y3xRtdNczq8EsE4/f8FumX2q77ROvNXk8UGMEKdUz6tYJHljaZAbuyUH+UR1to5BEohTuqwPCeS4pAA/qY6o/kyHOAMCeRK3owJnj+rH1jjxhqpVsstaebCz6TmnHWyXyY+xHjSBWBY/bvSgadtXBj9u9KCN3rnIfkzkQVsTEEX0Y2IP2oKo/HhMICcFAThUcwVZNGU6FdbX/XURzkbVF4+ybGhjPrFdgP66QdXNurGtSdk6Xdb9nAJ8oDo3OQlsQZzkdPw41ONBo6vI5scDefRjZg+6gpg3Pxp50CXEvPjR2IOuIXL3oxUPuobI3Y9WPOgDIlc/WvOgL4iL/vqFCcD7LH0xB4hj7cfQ/fWH9qCT+FhG0tN+DBk1PzjOM0SVllixcsBT1AvYc/kAPhc0hRg/3uvxoCgKRN9+dOrBUBB9+9GpB0NC9OVH5x4MDdG1H714kANEV3705kEOEBf9dcPi/lQnsuvLg1wgSu3Ha0v7Uh4MMgUXeuG71H407a+VBy9CPQkOdw+MtB+nGbd/D+FBbhBNxo9SjwcngJjNj0E9yBFiFj8G9SBXiGn8GNyDnCEm8SMLD3KHGOdHNh7kDjHOj2w8mAeIi/5arX+c6b/fxHz9oADEdGdjR/fXCw/OOB5oVfCOgnepz8IB14PMw03jCmTE+QBx5z0gAmKSqK9OUF+hcAeIhu/QYr4Qie8rjW83hhMBERARQAREQAREBBABERCLnH8BBgA+TQI7U4t53AAAAABJRU5ErkJggg=='
+			},
+			defaultIcon: { // 折叠时候的ic
+				type: String,
+				default: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFEAAABRCAYAAACqj0o2AAACE0lEQVR4Xu3c200DMRCF4XEltJAOkEugA+ggpUAHoQMqiFMCdEAJUMEiS4mEELlIO7bPOeN9i6K1rG/952myyea1WiCtXmEuYBPR4RBMxInoIOCwhOtJLKVszWyXc/5y2BvNEq6I+/3+kFK6M7OHnPM7jcLKjbZAvD/uaZtzflm5P4rbWyJWgDcze1LPuzVihfxUz7sH4ilJ2bx7Isrm3RtRMu8RiHJ5j0SUyXs0okTeCIj0eSMh0uaNhkiZNyIiXd7IiDR5oyNS5M2ACJ83EyJs3myIkHkzIsLlzYwIkzc7IkTeCojD81ZCHJa3GuKQvBURu+etjNgtb3XELnlHQGyedyTEZnlHQ2ySd0RE97wjI7rlHR3RJe+JeIrbLOecD6ePpZQ6W1kn2epo4MUrPOKyLN8ppYq1+y1VStncOjIdGnFZlo+U0uOtWOeOY2TE12Ouq//pEA7xXL7XfvcufR8K0Svfv6CREN3yDYfYIt9QiK3yjYTYLF95xB75SiP2ylcZsVu+cogj8pVCHJWvEuKwfOkREfKlRkTJlxkRJl86RMR8qRBR82VChM0XHpEhX2hElnyREWnyhUNkzBcKkTVfJETafIcjKuQ7FFEl35GIMvl2R1TMtyuiar49EWXzbY5oZpv/hibXTF2h3+s60FRKeT6+3TjMS3nrA3ZFRD8xrfY3ER1kJ+JEdBBwWGKeRAfEH1wS5WFZSDB/AAAAAElFTkSuQmCC'
+			},
+			lastIcon: { // 没有子集的ic
+				type: String,
+				default: ''
+			},
+			border: { // 是否有分割线
+				type: Boolean,
+				default: false
+			},
+			checkStrictly: {	// 只有在funcMode为checkbox状态下生效； 状态下节点选择完全受控（父子节点选中状态不再关联）
+				type: Boolean,
+				default: false
+			},
+			checkStrictlyModel: { // 关联模式 weak: 弱关联；strong: 强关联
+				type: String,
+				default: 'weak'
+			},
+			showHalfCheckedTips: { // 只有在funcMode为checkbox, checkStrictly为false状态下生效； 父子节点选中状态不再关联，显示半选提示
+				type: Boolean,
+				default: true
+			},
+			ifSearch: {	// 是否开启search模式
+				type:Boolean,
+				default: true
+			},
+			searchModel: {	// 搜索模式配置
+				type: String,
+				default:'common' // depHighlight: 从属高亮；common: 一般；remote：远程
+			},
+			showAuxiliaryLine: {	// 辅助线模式
+				type:Boolean,
+				default: false
+			},
+			loadData: {
+				type: Function
+			},
+			height: {
+				type: Number,
+				default: 500
+			},
+			changeVerify: {
+				type: Function
+			},
+			expandedKeys: {	// (Controlled) Specifies the keys of the expanded treeNodes
+				type: Array,
+				default: () => ([])
+			},
+			expandedMode: { // common:  一般模式；singe: 单一模式；
+				type: String,
+				default: 'common'
+			}
+		},
+		data() {
+			return {
+				showTree: false,
+				treeList: [],
+				currentTreeData: [],
+				selectIndex: -1,
+				keywords: '',
+				nodeInitContrl: {},
+				top: '',
+				initNum: 1
+			}
+		},
+		computed: {
+			_showTreeBar() {
+				return this.uiMode === 'popup'
+			},
+			_themeColor() {
+				return this.themeColor || '#f9ae3d'
+			},
+			_treeList () {
+				if(this.ifSearch && this.keywords) {
+					return this.treeList.filter(item => {
+						return (item.name && item.name.indexOf(this.keywords) !== -1)
+					}).map(item => {
+						const o = JSON.parse(JSON.stringify(item));
+						if(o.showChild === false) {
+							o.showChild = true;
+						}
+						if(o.show === false) {
+							o.show = true;
+						}
+						return o
+					})
+				} else {
+					return this.treeList
+				}		
+			},
+			customTitle() {
+				if(typeof this.title === 'function') {
+					return this.title(this._getCheckedParams());
+				} else {
+					return this.title
+				}
+			},
+			multiple() {
+				if(this.funcMode === 'checkbox') {
+					return true
+				} else if(this.funcMode === 'radio') {
+					return false
+				} else {
+					return true
+				}
+			}
+		},
+		methods: {
+			_show() {
+				this.showTree = true
+			},
+			_hide() {
+				this.showTree = false
+			},
+			_cancel() {
+				this._hide()
+				this.$emit("cancel", '');
+			},
+			_confirm() {
+				// 处理所选数据
+				let rt = this._getCheckedParams();
+				this._hide()
+				
+				this.$emit("confirm", rt);
+			},
+			_getLabelSlotData(item) {
+				const _it = this.getItemFromTreeData(this.currentTreeData, item.id);
+				const it = Object.assign({}, _it);
+				delete it[this.childrenKey];
+				return it
+			},
+			_getCheckedParams() {
+				// 处理所选数据
+				let rt = [],
+					obj = {};
+				this.treeList.forEach((v, i) => {
+					if (this.treeList[i].checked) {
+						obj = {}
+						obj.parents = this.treeList[i].parents
+						obj = Object.assign(obj, this.treeList[i].source)
+						// 移除子元素
+						delete obj.children
+						rt.push(obj)
+					}
+				});
+				return rt;
+			},
+			_addSubItem(item) {
+				if(item.disabled) return;
+				const it = Object.assign({}, item);
+				if(item.lastRank) {
+					item.lastRank = false;
+					item.showChild = true;
+				}
+				this.$nextTick(() => {
+					this.initNum++;
+					const parentId = item.parentId.concat([]);
+					const parents = item.parents.concat([]);
+					parentId.push(item.id);
+					parents.push(item);
+					it.disabled = false;
+					it.rank = it.rank + 1;
+					it.id = `next-tree-${this.initNum}`;
+					it.parentId = [...parentId];
+					it.parents = [...parents];
+					it.show = true;
+					it.showChild = false;
+					it.open = false;
+					it.name = '';
+					it.status = 'edit';
+					it.source = {};
+					it.hideArr = [];
+					it.lastRank = true;
+					let index = -1;
+					for (let i = this.treeList.length - 1; i >= 0; i--) {
+						if(this.treeList[i].id === item.id) {
+							index = i;
+							break; 
+						}
+					}
+					if(index !== -1) {
+						this.treeList.splice(index + 1, 0, it);
+					}
+				})
+			},
+			_addSameItem(item) {
+				if(item.disabled) return;
+				const it = Object.assign({}, item);
+				let index = -1;
+				for (let i = this.treeList.length - 1; i >= 0; i--) {
+					if(this.treeList[i].id === item.id || this.treeList[i].parentId.indexOf(item.id) !== -1) {
+						index = i;
+						break; 
+					}
+				}
+				this.initNum++;
+				it.id = `next-tree-${this.initNum}`;
+				it.source = {};
+				it.hideArr = [];
+				it.name = "";
+				it.status = 'edit';
+				if(index !== -1) {
+					this.treeList.splice(index + 1, 0, it);
+				}
+			},
+			async _complete(item) {
+				if (item.name) {
+					item.status = 'loading';
+					if(item.operateCallback) {
+						await item.operateCallback('complete', item);
+						await this.$nextTick();
+					}
+					item.status = '';
+				} else {
+					uni.showToast({
+						title: '请先完善内容',
+						icon: 'none'
+					})
+				}
+			},
+			_editItem(item) {
+				if(item.disabled) return;
+				item.status = 'edit';
+			},
+			_revert() {
+				this.uiModeInit();
+			},
+			async _delItem(item) {
+				if(item.disabled) return;
+				item.status = 'loading';
+				if(item.operateCallback) {
+					await item.operateCallback('delete', item);
+					await this.$nextTick();
+				}
+				this.delItemFunc(item);
+			},
+			delItemFunc(item) {
+				const id = item && item.id ? item.id : '';
+				const ids = [];
+				this.treeList.map((it, index) => {
+					if(it.id === id) {
+						ids.push(index);
+					} else if(it.parentId.indexOf(id) !== -1) {
+						ids.push(index);
+					}
+				});
+				ids.sort((a, b) => b - a);
+				ids.forEach(index => {
+				    this.treeList.splice(index, 1);
+				});
+			},
+			checkedFunc(values, state = true) {
+				if(values instanceof Array) {
+					values.map(id => {
+						const item = this.treeList.find(it => it.id === id);
+						if(item) {
+							item.checked = !!state
+						}
+					})
+				} else {
+					const _item = this.treeList.find(it => it.id === values);
+					if(_item) {
+						_item.checked = !!state
+					}
+				}
+			},
+			getRenderTreeList(list = [], rank = 0, parentId = [], parents = []) {
+				const treeList = [];
+				list.forEach(item => {
+					const halfChecked = this.getHalfCheckedFormTreeData(item);
+					let ouputText = '';
+					if(this.searchModel === 'depHighlight') {
+						if(parents && parents.length) {
+							ouputText = parents.map(item => item[this.labelKey]).join(' > ');
+							ouputText = ouputText + ' > ' + item[this.labelKey];
+						} else {
+							ouputText = item[this.labelKey];
+						}
+					}
+					const bool1 = this.expandedKeys.indexOf(item[this.valueKey]) !== -1;
+					const len = parentId.length;
+					const bool2 = len > 0 ? this.expandedKeys.indexOf(parentId[len - 1]) !== -1 : bool1;
+					treeList.push({
+						id: item[this.valueKey],
+						name: item[this.labelKey],
+						source: item,
+						parentId, // 父级id数组
+						parents, // 父级id数组
+						rank, // 层级
+						showChild: bool1, //子级是否显示
+						open: bool1, //是否打开
+						show: (bool1 || bool2) || rank === 0, // 自身是否显示
+						hideArr: [],
+						ouputText,
+						orChecked: item.checked ? item.checked : false,
+						checked: item.checked ? item.checked : false,
+						halfChecked,
+						disabled: this.disabledKey && item[this.disabledKey] === true,
+						status: '',
+						operateCallback: (typeof item.operateCallback) === 'function' ? item.operateCallback : undefined
+					})
+					if(bool1) {
+						this.nodeInitContrl[item[this.valueKey]] = true;
+					} else {
+						this.nodeInitContrl[item[this.valueKey]] = undefined;
+					}
+					if (
+						(Array.isArray(item[this.childrenKey]) && item[this.childrenKey].length > 0) ||
+						(this.loadData && Array.isArray(item[this.childrenKey]) &&item[this.childrenKey].length === 0)
+					) {
+						let parentid = [...parentId],
+							parentArr = [...parents],
+							childrenid = [];
+						delete parentArr.children
+						parentid.push(item[this.valueKey]);
+						parentArr.push({
+							[this.valueKey]: item[this.valueKey],
+							[this.labelKey]: item[this.labelKey],
+						})
+					} else if(item[this.childrenKey] === null) {
+						treeList[treeList.length - 1].lastRank = false;
+					} else {
+						treeList[treeList.length - 1].lastRank = true;
+					}
+				})
+				return treeList;
+			},
+			//扁平化树结构
+			_renderTreeList(list = [], rank = 0, parentId = [], parents = []) {
+				list.forEach(item => {
+					const halfChecked = this.getHalfCheckedFormTreeData(item);
+					let ouputText = '';
+					if(this.searchModel === 'depHighlight') {
+						if(parents && parents.length) {
+							ouputText = parents.map(item => item[this.labelKey]).join(' > ');
+							ouputText = ouputText + ' > ' + item[this.labelKey];
+						} else {
+							ouputText = item[this.labelKey];
+						}
+					}
+					const bool1 = this.expandedKeys.indexOf(item[this.valueKey]) !== -1;
+					const len = parentId.length;
+					const bool2 = len > 0 ? this.expandedKeys.indexOf(parentId[len - 1]) !== -1 : bool1;
+					this.treeList.push({
+						id: item[this.valueKey],
+						name: item[this.labelKey],
+						source: item,
+						parentId, // 父级id数组
+						parents, // 父级id数组
+						rank, // 层级
+						showChild: bool1, //子级是否显示
+						open: bool1, //是否打开
+						show: (bool1 || bool2) || rank === 0, // 自身是否显示
+						hideArr: [],
+						ouputText,
+						orChecked: item.checked ? item.checked : false,
+						checked: item.checked ? item.checked : false,
+						halfChecked,
+						disabled: this.disabledKey && item[this.disabledKey] === true,
+						status: '',
+						operateCallback: (typeof item.operateCallback) === 'function' ? item.operateCallback : undefined
+					})
+					if(bool1) {
+						this.nodeInitContrl[item[this.valueKey]] = true;
+					} else {
+						this.nodeInitContrl[item[this.valueKey]] = undefined;
+					}
+					if (
+						(Array.isArray(item[this.childrenKey]) && item[this.childrenKey].length > 0) ||
+						(this.loadData && Array.isArray(item[this.childrenKey]) &&item[this.childrenKey].length === 0)
+					) {
+						let parentid = [...parentId],
+							parentArr = [...parents],
+							childrenid = [];
+						delete parentArr.children
+						parentid.push(item[this.valueKey]);
+						parentArr.push({
+							[this.valueKey]: item[this.valueKey],
+							[this.labelKey]: item[this.labelKey],
+						})
+						this._renderTreeList(item[this.childrenKey], rank + 1, parentid, parentArr);
+					} else if(item[this.childrenKey] === null) {
+						this.treeList[this.treeList.length - 1].lastRank = false;
+					} else {
+						this.treeList[this.treeList.length - 1].lastRank = true;
+					}
+				})
+			},
+			// 处理默认选择
+			_defaultSelect() {
+				this.treeList.forEach((v, i) => {
+					if (v.checked) {
+						this.treeList.forEach((v2, i2) => {
+							if (v.parentId.toString().indexOf(v2.parentId.toString()) >= 0) {
+								v2.show = true
+								if (v.parentId.includes(v2.id)) {
+									v2.showChild = true;
+									v2.open = true;
+								}
+							}
+						})
+					}
+				})
+			},
+			// 点击
+			async _treeItemTap(item, _index) {
+				const index = this.treeList.findIndex(it =>it.id === item.id);
+				if (item.lastRank === true) {
+					if (item.disabled === true) return				
+					if (['checkbox', 'radio'].indexOf(this.funcMode) === -1) return 
+					//点击最后一级时触发事件
+					this.treeList[index].checked = !this.treeList[index].checked;
+					
+					if(this.changeVerify && (typeof this.changeVerify === 'function')) {
+						const current = Object.assign({}, item.source);
+						current.checked = item.checked;
+						const tip = this.changeVerify(current, this.multiple ? this._getCheckedParams() : [current]);
+						if(tip) {
+							this.treeList[index].checked = !this.treeList[index].checked;
+							uni.showToast({
+								title: tip,
+								icon: 'none'
+							});
+							return
+						}
+					};
+					this.treeList[index].halfChecked = false;
+					if(this.multiple && !this.checkStrictly && this.showHalfCheckedTips) {
+						this.updateHalfChecked(index);
+					} else if(this.multiple && this.checkStrictly) {
+						this.updateParentChecked(index);
+					}
+					this._fixMultiple(index);
+					this.$emit("change", this._getCheckedParams());
+					return;
+				} else if(this.ifSearch && this.keywords) {
+					// 搜索模式下不处理展开收起逻辑
+					return
+				}
+				// loadData实现
+				const isLoadData = this.loadData && !this.nodeInitContrl[item.id];
+				if(isLoadData) {
+					uni && uni.showLoading({ title: "请稍后..." });
+					const newChild = await this.loadData({$type: 'nodeLoad', source: this.treeList[index].source});
+					// 为了保证treeData数据的完整性，异步加载的数据需要添加到treeData上；
+					const treeItem = this.getItemFromTreeData(this.currentTreeData, item.id);
+					treeItem[this.childrenKey] = newChild && newChild.length ? newChild : undefined; 
+					const parentId = item.parentId || [];
+					const lists = this.getRenderTreeList(newChild || [], item.rank + 1, parentId.concat([item.id]), [{[this.valueKey]: item[this.valueKey],[this.labelKey]: item[this.labelKey]}]);
+					this.nodeInitContrl[item.id] = true;
+					this.treeList.splice(index+1, 0, ...lists);
+				}
+				const childLen = this.treeList.filter(it => it.parentId.includes(item.id)).length;
+				if(!isLoadData && childLen > 50) {
+					uni && uni.showLoading({ title: "请稍后..." });
+				}
+				let list = this.treeList;
+				let id = item.id;
+				item.showChild = !item.showChild;
+				item.open = item.showChild ? true : !item.open;
+				list.forEach((childItem, i) => {
+					if (item.showChild === false) {
+						//隐藏所有子级
+						if (!childItem.parentId.includes(id)) {
+							return;
+						} else {
+							if (!this.foldAll) {
+								if (childItem.lastRank !== true && !childItem.open) {
+									childItem.showChild = false;
+								}
+								// 为隐藏的内容添加一个标记
+								if (childItem.show) {
+									childItem.hideArr[item.rank] = id
+								}
+							} else {
+								if (childItem.lastRank !== true) {
+									childItem.showChild = false;
+								}
+							}
+							childItem.show = false;
+						}		
+					} else {
+						// 打开子集
+						if (childItem.parentId[childItem.parentId.length - 1] === id) {
+							childItem.show = true;
+						}
+
+						// 打开被隐藏的子集
+						if (childItem.parentId.includes(id) && !this.foldAll) {
+							if (childItem.hideArr[item.rank] === id) {
+								childItem.show = true;
+								if (childItem.open && childItem.showChild) {
+									childItem.showChild = true
+								} else {
+									childItem.showChild = false
+								}
+								childItem.hideArr[item.rank] = null
+							}
+						} else if(this.expandedMode === 'singe' && !childItem.parentId.includes(id)) {
+							if (childItem.id !== id) {
+								const bool1 = item.parentId.some(id => {
+									return (childItem.parentId && childItem.parentId.indexOf(id) !== -1) || childItem.rank === 0;
+								});
+								const childItemParentId = [...childItem.parentId];
+								const _id =  childItemParentId ? childItemParentId.pop() : '';
+								const nodeList = [item, { parentId: childItemParentId.length ? childItemParentId : [] }];
+								if(!childItem.lastRank) {
+									if(item.parentId.indexOf(childItem.id) === -1) {
+										childItem.showChild = false;
+									}
+									
+									if(!bool1 && !this.isSiblingNode([item, childItem])) {
+										childItem.show = false;
+									} else if(childItem.rank !== 0 && _id !== id && this.isSiblingNode(nodeList)) {
+										childItem.show = false;
+									} else if (childItem.rank !== 0 && _id !== id && !this.isSiblingNode(nodeList) && this.isParentSiblingNode(nodeList)) {
+										childItem.show = false;
+									}
+								} else {
+									if(!this.isSiblingNode([item, childItem]) && !bool1) {
+										childItem.show = false;
+									} else if(_id !== id && this.isSiblingNode(nodeList)) {
+										childItem.show = false;
+									} else if (_id !== id && !this.isSiblingNode(nodeList) && this.isParentSiblingNode(nodeList)) {
+										childItem.show = false;
+									}
+								}
+							}
+						}
+					}
+				});
+				setTimeout(() => {
+					uni && uni.hideLoading()
+				})
+			},
+			isSiblingNode(targetArr = []) {
+				const target1 = targetArr && targetArr.length ? targetArr[0] : {};
+				let target1Id = '';
+				if(target1.parentId && target1.parentId.length) {
+					target1Id = target1.parentId[target1.parentId.length - 1]
+				}
+				return targetArr.every(item => {
+					if(item && item.parentId && item.parentId.length) {
+						return target1Id === item.parentId[item.parentId.length - 1]
+					} else {
+						return target1Id === ''
+					}
+				})
+			},
+			isParentSiblingNode(targetArr = []) {
+				const target1 = targetArr && targetArr.length ? targetArr[0] : {};
+				let target1Id = '';
+				if(target1.parentId && target1.parentId.length) {
+					target1Id = target1.parentId[target1.parentId.length - 1]
+				}
+				return targetArr.every(item => {
+					if(item && item.parentId && item.parentId.length) {
+						return item.parentId.some(id => id === target1Id) && target1Id !== '';
+					} else {
+						return target1Id === '';
+					}
+				})
+			},
+			getThemeNodes(text) {
+				const _text = (text || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+				const regex = new RegExp(`(${text || ''})`, 'gi');
+				return text ? text.replace(regex, `<span style="color: ${this._themeColor}">$1</span>`) : '';
+			},
+			getNodes(ouputText) {
+				if(this.keywords && ouputText) {
+					const key = (this.keywords || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+					const regex = new RegExp(`(${key})`, 'gi');
+					return ouputText.replace(regex, `<span style="color: ${this._themeColor}">$1</span>`);
+				}
+				return ouputText
+			},
+			getHalfCheckedFormTreeData(item) {
+				if (this.checkStrictly) {
+					return false;
+				} else if (!this.showHalfCheckedTips) {
+					return false
+				} else {
+					if(item[this.childrenKey] && item[this.childrenKey].length) {
+						return item[this.childrenKey].some(it => {
+							if(it.checked === true) {
+								return true;
+							} else if(it[this.childrenKey] && it[this.childrenKey].length) {
+								return this.getHalfCheckedFormTreeData(it);
+							} else {
+								return false;
+							};
+						});
+					} else {
+						return false;
+					}
+				}
+			},
+			getItemFromTreeData(treeData, id) {
+				if(id) {
+					let item = null;
+					(treeData || []).some(it => {
+						if(it[this.valueKey] === id) {
+							item = it
+							return true
+						} else if(it[this.childrenKey] && it[this.childrenKey].length) {
+							item = this.getItemFromTreeData(it[this.childrenKey], id)
+							return !!item
+						} else {
+							return false
+						}
+					});
+					return item
+				};
+				return null
+			},
+			_treeItemSelect(item, _index) {
+				const index = this.treeList.findIndex(it =>it.id === item.id);
+				if (item.disabled === true) return
+				this.treeList[index].checked = !this.treeList[index].checked;
+				
+				if(this.changeVerify && (typeof this.changeVerify === 'function')) {
+					const current = Object.assign({}, item.source);
+					current.checked = item.checked;
+					const tip = this.changeVerify(current, this.multiple ? this._getCheckedParams() : [current]);
+					if(tip) {
+						this.treeList[index].checked = !this.treeList[index].checked;
+						uni.showToast({
+							title: tip,
+							icon: 'none'
+						});
+						return
+					}
+				};
+				this.treeList[index].halfChecked = false;
+				if (this.multiple && this.checkStrictly) {
+					if(!item.lastRank) {
+						const source = item.source || {};
+						const children = source[this.childrenKey] || [];
+						const checkedKeyList = this.getChildrenKeys(children);
+						this.treeList.forEach((v, i) => {
+							if(checkedKeyList.indexOf(v.id) !== -1) {
+								if(this.checkStrictlyModel === 'weak') {
+									if(!this.treeList[i].disabled) {
+										this.treeList[i].checked = this.treeList[index].checked
+									}
+								} else if(this.checkStrictlyModel === 'strong') {
+									this.treeList[i].checked = this.treeList[index].checked
+								}
+							}
+						})
+					}
+					this.updateParentChecked(index)			
+				} else if(this.multiple && !this.checkStrictly && this.showHalfCheckedTips) {
+					this.updateHalfChecked(index);
+				} else {
+					this._fixMultiple(index);
+				}
+				
+				this.$emit("change", this._getCheckedParams());
+			},
+			updateParentChecked(index) {
+				const parentId = (this.treeList[index].parentId || []).concat([]).reverse();
+				if(parentId && parentId.length) {
+					parentId.map(id => {
+						const parentTreeDataItem = this.getItemFromTreeData(this.currentTreeData, id);
+						const childrenIds = (parentTreeDataItem[this.childrenKey] || []).map(item => item[this.valueKey]);
+						const bool = this.treeList
+						.filter(it => childrenIds.indexOf(it.id) !== -1)
+						.every(it => it.checked === true);
+						
+						const _bool = this.treeList
+						.filter(it => childrenIds.indexOf(it.id) !== -1)
+						.every(it => it.checked === false);
+						
+						const parentItem = this.treeList.find(it => it.id === id);
+						if(parentItem) {
+							if (this.checkStrictlyModel === 'weak') {
+								if(bool && !parentItem.disabled) {
+									parentItem.checked = true;
+								} else if(_bool && !parentItem.disabled) {
+									parentItem.checked = false;
+								}
+							} else if(this.checkStrictlyModel === 'strong') {
+								if(bool) {
+									parentItem.checked = true;
+								} else {
+									parentItem.checked = false;
+								}
+							}	
+						}
+					})
+				}
+			},
+			updateHalfChecked(index) {
+				const _parentId = this.treeList[index].parentId || [];
+				const parentId = _parentId.concat([]).reverse();
+				if(parentId && parentId.length) {
+					parentId.map(id => {
+						const parentTreeDataItem = this.getItemFromTreeData(this.currentTreeData, id);
+						const childrenIds = (parentTreeDataItem[this.childrenKey] || []).map(item => item[this.valueKey]);
+						
+						const bool = this.treeList
+						.filter(it => childrenIds.indexOf(it.id) !== -1)
+						.every(it => it.checked === false && it.halfChecked === false);
+						
+						const _bool = this.treeList
+						.filter(it => childrenIds.indexOf(it.id) !== -1)
+						.some(it => it.checked === true || it.halfChecked === true);
+						
+						const parentItem = this.treeList.find(it => it.id === id);
+						if(parentItem) {
+							if(!parentItem.checked) {
+								if(bool) {
+									parentItem.halfChecked = false
+								} else if (_bool) {
+									parentItem.halfChecked = true
+								} else {
+									parentItem.halfChecked = false
+								}
+							}
+						}
+					})
+				}
+				if(this.treeList[index].checked == false) {
+					const source = this.treeList[index].source || {};
+					const children = source[this.childrenKey] || [];
+					const checkedKeyList = this.getChildrenKeys(children);
+					const bool = this.treeList.filter(item => checkedKeyList.indexOf(item.id) !== -1).some(item => item.checked);
+					if(bool) {
+						this.treeList[index].halfChecked = true;
+					}
+				}
+			},
+			showHalfChecked(item) {
+				if(this.multiple && !this.checkStrictly && item.halfChecked === true) {
+					return true
+				} else {
+					return false
+				}
+			},
+			getChildrenKeys(children) {
+				let keys = [];
+				(children || []).map(item => {
+					keys.push(item[this.valueKey])
+					if (item[this.childrenKey] && item[this.childrenKey].length) {
+						keys = keys.concat(this.getChildrenKeys(item[this.childrenKey]))
+					}
+				})
+				return keys
+			},
+			// 处理单选多选
+			_fixMultiple(index) {
+				if (!this.multiple) {
+					// 如果是单选
+					this.treeList.forEach((v, i) => {
+						if (i != index) {
+							this.treeList[i].checked = false
+						} else {
+							this.treeList[i].checked = true
+						}
+					})
+				}
+			},
+			// 重置数据
+			_reTreeList() {
+				this.treeList.forEach((v, i) => {
+					this.treeList[i].checked = v.orChecked
+				})
+			},
+			_initTree(){
+				this.treeList.length = 0;
+				if(this.loadData) {
+					this.currentTreeData = JSON.parse(JSON.stringify(this.treeData));
+				} else {
+					this.currentTreeData = this.treeData;
+				}
+				this._renderTreeList(this.currentTreeData);
+				this.$nextTick(() => {
+					this._defaultSelect();
+				})
+			},
+			_clear() {
+				this.treeList.map(item => {
+					if(this.multiple && this.checkStrictly) {
+						if(this.checkStrictlyModel === 'strong') {
+							item.checked = false;
+						} else if(this.checkStrictlyModel === 'weak') {
+							if(!item.disabled) {
+								item.checked = false;
+							};
+						} else {
+							item.checked = false;
+						} 
+					} else {
+						if(!item.disabled) {
+							item.checked = false;
+						}
+					};
+					
+					item.halfChecked = false;
+				})
+				this.$emit("change", this._getCheckedParams());
+				this.$emit("clear");
+			},
+			async onSearch(val) {
+				if(this.searchModel === 'remote') {
+					if(this.loadData) {
+						if(val) {
+							const newChild = await this.loadData({$type: 'remoteSearch', source: val});
+							const lists = this.getRenderTreeList(newChild);
+							this.treeList = [...lists];
+						} else {
+							this._initTree();
+						}
+					} else {
+						uni.showToast({
+							title: "使用远程搜索模式，需要配置loadData函数；",
+							icon: 'none'
+						})
+					}
+				} else {
+					this.keywords = val;
+				}
+			},
+			initUiModePopup(watched) {
+				uni.getSystemInfo({
+				  success: (res) => {
+						this.top = (res.windowHeight - this.height) + 'px';
+				  }
+				});
+				watched && watched();
+				watched = this.$watch(() => this.showTree, (bool) => {
+					if(bool) {
+						this._initTree();
+					} else {
+						this.$nextTick(() => {
+							setTimeout(() => {
+								this.treeList.length = 0;
+								this.nodeInitContrl = {};
+							})
+						})
+					}
+				}, {immediate: true});
+			},
+			initUiModePage(watched) {
+				this.top = '0px';
+				watched && watched();
+				watched = this.$watch(() => this.treeData, () => {
+					this.treeList.length = 0;
+					this.nodeInitContrl = {};
+					this.$nextTick(() => {
+						this._initTree();
+					});
+				}, {immediate: true, deep: true})
+				this.$nextTick(() => {
+					this.showTree = true;
+				});
+			},
+			uiModeInit() {
+				let watched = null;
+				if(this.uiMode === 'popup') {
+					this.initUiModePopup(watched);
+				} else if (this.uiMode === 'page') {
+					this.initUiModePage(watched);
+				} else {
+					this.initUiModePopup(watched);
+				}
+			}
+		},
+		mounted() {
+			console.log('----------next-tree组件完成挂载demo------------')	
+			this.uiModeInit();
+		}
+	}
+</script>
+
+<style scoped>
+	@import "./style.css";
+</style>
diff --git a/uni_modules/next-tree/components/next-tree/style.css b/uni_modules/next-tree/components/next-tree/style.css
new file mode 100644
index 0000000..76c987f
--- /dev/null
+++ b/uni_modules/next-tree/components/next-tree/style.css
@@ -0,0 +1,269 @@
+@font-face {
+	font-family: 'iconfont';
+	src: url('//at.alicdn.com/t/c/font_4110624_qs48wckazsh.ttf?t=1712479573821') format('truetype');
+}
+@keyframes spin {
+	0% { transform: rotate(0deg); }
+	100% { transform: rotate(360deg); }
+}
+
+.iconfont {
+	font-family: iconfont;
+	font-style: normal;
+}
+.iconfont-loading {
+	font-family: iconfont;
+	display: inline-block;
+	font-style: normal;
+	animation: spin 1s linear infinite;
+}
+.next-tree-mask {
+  position: fixed;
+  top: 0rpx;
+  right: 0rpx;
+  bottom: 0rpx;
+  left: 0rpx;
+  z-index: 997;
+  background-color: rgba(0, 0, 0, 0.6);
+  opacity: 0;
+  transition: all 0.3s ease;
+  visibility: hidden;
+}
+.next-tree-mask.show {
+  visibility: visible;
+  opacity: 1;
+}
+.next-tree-cnt {
+  position: fixed;
+  top: 0rpx;
+  right: 0rpx;
+  bottom: 0rpx;
+  left: 0rpx;
+  z-index: 997;
+  top: 360rpx;
+  transition: all 0.3s ease;
+  transform: translateY(100%);
+}
+.next-tree-cnt.next-tree-cnt-page {
+	transition: none;
+}
+.next-tree-cnt.show {
+  transform: translateY(0);
+}
+.next-tree-bar {
+  background-color: #fff;
+  height: 72rpx;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-sizing: border-box;
+  border-bottom-width: 1rpx !important;
+  border-bottom-style: solid;
+  border-bottom-color: #f5f5f5;
+  font-size: 32rpx;
+  color: #757575;
+  line-height: 1;
+}
+.next-tree-bar-btns {
+	display: inline-block;
+	display: flex;
+	flex-direction: row;
+}
+.btn-divid {
+	display: inline-block;
+	width: 1px;
+	margin: 0 10px;
+	background-color: #ccc;
+}
+.next-tree-bar-confirm {
+  color: #f9ae3d;
+}
+.next-tree-view {
+  position: absolute;
+  top: 0rpx;
+  right: 0rpx;
+  bottom: 0rpx;
+  left: 0rpx;
+  top: 72rpx;
+  background-color: #fff;
+  padding-top: 20rpx;
+  padding-right: 20rpx;
+  padding-bottom: 20rpx;
+  padding-left: 20rpx;
+}
+.next-tree-view-sc {
+  height: 100%;
+  overflow: hidden;
+}
+.next-tree-view-sc .empty {
+	text-align: center;
+	color: #757575;
+	padding: 30rpx;
+}
+.next-tree-item-block {
+	
+}
+.next-tree-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 26rpx;
+  color: #757575;
+  line-height: 1;
+  height: 0;
+  opacity: 0;
+  transition: 0.2s;
+  position: relative;
+  overflow: hidden;
+}
+.next-tree-item .icon-btn {
+	font-size: 30rpx;
+	margin-right: 20rpx;
+}
+.next-tree-item .left-line {
+	position: relative;
+	width: 1rpx;
+	height: 100%;
+	box-sizing: border-box;
+}
+.next-tree-item .left-line::before {
+	position: absolute;
+	content: "";
+	width: 1rpx;
+	height: 100%;
+	background-color: rgba(204,204,204,0.9);
+	box-sizing: border-box;
+	
+	left: -18rpx;
+}
+.next-tree-item .parent-horizontal-line {
+	width: 1rpx;
+	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0rpx;
+	box-sizing: border-box;
+	background-color: rgba(204,204,204,0.9);
+}
+.next-tree-item .left-line .horizontal-line {
+	width: 20rpx;
+	height: 1rpx;
+	position: absolute;
+	top: 40rpx;
+	left: 0rpx;
+	background-color: rgba(204,204,204,0.9);
+	box-sizing: border-box;
+}
+
+.next-tree-item.show {
+  height: 80rpx;
+  opacity: 1;
+}
+.next-tree-item.showchild:before {
+  transform: rotate(90deg);
+}
+.next-tree-item.border {
+  border-bottom: 1rpx solid rgba(204,204,204,0.2);
+}
+.next-tree-item.last:before {
+  opacity: 0;
+}
+.next-tree-item.disabled {
+  color: #ccc!important;
+}
+
+.next-tree-icon {
+  width: 26rpx;
+  height: 26rpx;
+  margin-right: 8rpx;
+}
+.next-tree-label {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  height: 100%;
+  line-height: 1.2;
+}
+.next-tree-label .label-input {
+	border: 1rpx solid #f0f0f0;
+	border-radius: 10rpx;
+	width: 100%;
+	padding: 12rpx 18rpx;
+	margin-right: 30rpx;
+}
+.next-tree-check {
+  width: 40px;
+  height: 40px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.next-tree-check-yes,
+.next-tree-check-no {
+  width: 20px;
+  height: 20px;
+  border-top-left-radius: 20%;
+  border-top-right-radius: 20%;
+  border-bottom-right-radius: 20%;
+  border-bottom-left-radius: 20%;
+  border-top-width: 1rpx;
+  border-left-width: 1rpx;
+  border-bottom-width: 1rpx;
+  border-right-width: 1rpx;
+  border-style: solid;
+  border-color: #f9ae3d;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+}
+.next-tree-check-yes-b {
+  border-top-left-radius: 20%;
+  border-top-right-radius: 20%;
+  border-bottom-right-radius: 20%;
+  border-bottom-left-radius: 20%;
+  background-color: #f9ae3d;
+	color: #fff;
+}
+.next-tree-check-yes-b .icon-text {
+	font-size: 14px;
+	font-weight: normal;
+	font-family: uicon-iconfont;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+}
+.next-tree-check .radio {
+  border-top-left-radius: 50%;
+  border-top-right-radius: 50%;
+  border-bottom-right-radius: 50%;
+  border-bottom-left-radius: 50%;
+}
+.next-tree-check .radio .next-tree-check-yes-b {
+  border-top-left-radius: 50%;
+  border-top-right-radius: 50%;
+  border-bottom-right-radius: 50%;
+  border-bottom-left-radius: 50%;
+}
+
+.next-tree-item.disabled .next-tree-check-no {
+	color: #ccc!important;
+}
+.next-tree-item.disabled .next-tree-check-yes-b {
+	background-color: #ccc!important;
+}
+.hover-c {
+  opacity: 0.6;
+}
+
+.fixed-bottom-bar {
+	position: fixed;
+	bottom: 0rpx;
+	left: 0rpx;
+	right: 0rpx;
+	z-index: 998;
+}
+
+
diff --git a/uni_modules/next-tree/package.json b/uni_modules/next-tree/package.json
new file mode 100644
index 0000000..6eb8ba2
--- /dev/null
+++ b/uni_modules/next-tree/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "next-tree",
+  "displayName": "next-tree（超强树选择器、树组件、树插件、无限级联树、单选树、多选树、自定义样式树、树形选择器）",
+  "version": "1.8.7",
+  "description": "next-tree 弹窗树形选择器，支持多选，支持大数据， 无限级联，单选，父子级级联，远程/ajax加载，子节点增量/异步渲染，自定义样式定制，具名插槽等;支持h5/小程序/APP，全端通用",
+  "keywords": [
+    "树选择",
+    "tree",
+    "弹窗树选择器",
+    "多选树",
+    "单选树"
+],
+"engines": {
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "修改版本说明",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["next-search-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "n",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "u",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "u",
+          "飞书": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
index d0d7282..6dd37a7 100644
--- a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
@@ -1,15 +1,17 @@
 {
-	"passwordSecret": "passwordSecret-demo",
-	"tokenSecret": "tokenSecret-demo",
+	"passwordSecret": "test-passwordSecret",
+	"tokenSecret": "test-tokenSecret",
 	"tokenExpiresIn": 7200,
 	"tokenExpiresThreshold": 600,
 	"passwordErrorLimit": 6,
 	"bindTokenToDevice": false,
 	"passwordErrorRetryTime": 3600,
-	"autoSetInviteCode": false,
+	"autoSetInviteCode": true,
 	"forceInviteCode": false,
+	"preferedAppPlatform": "app",
+	"requestAuthSecret": "testSecret",
 	"app": {
-		"tokenExpiresIn": 2592000,  
+		"tokenExpiresIn": 2592000,
 		"oauth": {
 			"weixin": {
 				"appid": "wx97a8f7019d175ced",
@@ -20,6 +22,18 @@
 			}
 		}
 	},
+	"web": {
+		"oauth": {
+			"weixin-h5": {
+				"appid": "微信浏览器内微信登录，所用的微信公众号appid",
+				"appsecret": "微信公众号后台获取的appsecret"
+			},
+			"weixin-web": {
+				"appid": "手机微信扫码登录，所用的微信开放平台（https://open.weixin.qq.com/）-网站应用的appid",
+				"appsecret": "微信开放平台-网站应用的appsecret"
+			}
+		}
+	},
 	"mp-weixin": {
 		"oauth": {
 			"weixin": {
@@ -31,26 +45,22 @@
 	"mp-alipay": {
 		"oauth": {
 			"alipay": {
-				"appid": "alipay appid",
-				"privateKey": "alipay privateKey"
+				"appid": "支付宝小程序登录用到的appid、privateKey请参考支付宝小程序的文档进行设置或者获取，https://opendocs.alipay.com/open/291/105971#LDsXr",
+				"privateKey": "支付宝小程序登录用到的appid、privateKey请参考支付宝小程序的文档进行设置或者获取，https://opendocs.alipay.com/open/291/105971#LDsXr"
 			}
 		}
 	},
 	"service": {
 		"sms": {
 			"name": "应用名称，对应短信模版的name",
-			"codeExpiresIn": 180,
-			"smsKey": "短信密钥key，开通短信服务处可以看到",
-			"smsSecret": "短信密钥secret，开通短信服务处可以看到",
-			"scene": {
-				"bind-mobile-by-sms": {
-					"templateId": "绑定手机号使用的短信验证码模板",
-					"codeExpiresIn": 240
-				}
-			}
+			"codeExpiresIn": 300,
+			"smsKey": "ec5fba39363dc30af7f21bbb5ac6e857",
+			"smsSecret": "09abff426ab62fd2e104c3be794b84c7"
 		},
 		"univerify": {
-			"appid": "当前应用的appid，使用云函数URL化，此项必须配置"
+			"appid": "当前应用的appid，使用云函数URL化，此项必须配置",
+			"apiKey": "apiKey 和 apiSecret 在开发者中心获取，开发者中心：https://dev.dcloud.net.cn/uniLogin/index?type=0，文档：https://ask.dcloud.net.cn/article/37965",
+			"apiSecret": ""
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/package.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/package.json
new file mode 100644
index 0000000..2b8132e
--- /dev/null
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "uni-id",
+  "dependencies": {}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
index a8b99d0..6fcc68c 100644
--- a/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
+++ b/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/index.js
@@ -1 +1,576 @@
-"use strict";var e,t=(e=require("crypto"))&&"object"==typeof e&&"default"in e?e.default:e;const n={TOKEN_EXPIRED:"uni-id-token-expired",CHECK_TOKEN_FAILED:"uni-id-check-token-failed",PARAM_REQUIRED:"uni-id-param-required",ACCOUNT_EXISTS:"uni-id-account-exists",ACCOUNT_NOT_EXISTS:"uni-id-account-not-exists",ACCOUNT_CONFLICT:"uni-id-account-conflict",ACCOUNT_BANNED:"uni-id-account-banned",ACCOUNT_AUDITING:"uni-id-account-auditing",ACCOUNT_AUDIT_FAILED:"uni-id-account-audit-failed",ACCOUNT_CLOSED:"uni-id-account-closed"};function i(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"function"==typeof e.then}function r(e){if(!e)return;const t=e.match(/^(\d+).(\d+).(\d+)/);return t?t.slice(1,4).map(e=>parseInt(e)):void 0}function o(e,t){const n=r(e),i=r(t);return n?i?function(e,t){const n=Math.max(e.length,t.length);for(let i=0;i<n;i++){const n=e[i],r=t[i];if(n>r)return 1;if(n<r)return-1}return 0}(n,i):1:i?-1:0}const s={"uni-id-token-expired":30203,"uni-id-check-token-failed":30202};function c(e){const{errCode:t,errMsgValue:n}=e;e.errMsg=this._t(t,n),t in s&&(e.code=s[t]),delete e.errMsgValue}function a(e){return"object"===(i=e,Object.prototype.toString.call(i).slice(8,-1).toLowerCase())&&e.errCode&&(t=e.errCode,Object.values(n).includes(t))&&!!e.errCode;var t,i}let u={"zh-Hans":{"uni-id-token-expired":"登录状态失效，token已过期","uni-id-check-token-failed":"token校验未通过","uni-id-param-required":"缺少参数: {param}","uni-id-account-exists":"此账号已注册","uni-id-account-not-exists":"此账号未注册","uni-id-account-conflict":"用户账号冲突","uni-id-account-banned":"从账号已封禁","uni-id-account-auditing":"此账号正在审核中","uni-id-account-audit-failed":"此账号审核失败","uni-id-account-closed":"此账号已注销"},en:{"uni-id-token-expired":"The login status is invalid, token has expired","uni-id-check-token-failed":"Check token failed","uni-id-param-required":"Parameter required: {param}","uni-id-account-exists":"Account exists","uni-id-account-not-exists":"Account does not exists","uni-id-account-conflict":"User account conflict","uni-id-account-banned":"Account has been banned","uni-id-account-auditing":"Account audit in progress","uni-id-account-audit-failed":"Account audit failed","uni-id-account-closed":"Account has been closed"}};try{const e=require.resolve("uni-config-center/uni-id/lang/index.js");u=function(e,t){const n=Object.keys(e);n.push(...Object.keys(t));const i={};for(let r=0;r<n.length;r++){const o=n[r];i[o]=Object.assign({},e[o],t[o])}return i}(u,require(e))}catch(e){}var d=u;function l(e){return e.replace(/=/g,"").replace(/\+/g,"-").replace(/\//g,"_")}function h(e){return JSON.parse((t=function(e){var t=4-(e=e.toString()).length%4;if(4!==t)for(var n=0;n<t;++n)e+="=";return e.replace(/-/g,"+").replace(/_/g,"/")}(e),Buffer.from(t,"base64").toString("utf-8")));var t}function f(e){return l((t=JSON.stringify(e),Buffer.from(t,"utf-8").toString("base64")));var t}function p(e,n){return l(t.createHmac("sha256",n).update(e).digest("base64"))}const k=function(e,t){if("string"!=typeof e)throw new Error("Invalid token");const n=e.split(".");if(3!==n.length)throw new Error("Invalid token");const[i,r,o]=n;if(p(i+"."+r,t)!==o)throw new Error("Invalid token");const s=h(i);if("HS256"!==s.alg||"JWT"!==s.typ)throw new Error("Invalid token");const c=h(r);if(1e3*c.exp<Date.now()){const e=new Error("Token expired");throw e.name="TokenExpiredError",e}return c},g=function(e,t,n={}){const{expiresIn:i}=n;if(!i)throw new Error("expiresIn is required");const r=parseInt(Date.now()/1e3),o={...e,iat:r,exp:r+n.expiresIn},s=f({alg:"HS256",typ:"JWT"})+"."+f(o);return s+"."+p(s,t)},_=uniCloud.database(),I=_.command,C=_.collection("uni-id-users"),T=_.collection("uni-id-roles");class E{constructor({uniId:e}={}){this.uid=null,this.userRecord=null,this.userPermission=null,this.oldToken=null,this.oldTokenPayload=null,this.uniId=e,this.config=this.uniId._getConfig(),this.clientInfo=this.uniId._clientInfo,this.checkConfig()}checkConfig(){const{tokenExpiresIn:e,tokenExpiresThreshold:t}=this.config;if(t>=e)throw new Error("Config error, tokenExpiresThreshold should be less than tokenExpiresIn");t>e/2&&console.warn(`Please check whether the tokenExpiresThreshold configuration is set too large, tokenExpiresThreshold: ${t}, tokenExpiresIn: ${e}`)}get customToken(){return this.uniId.interceptorMap.get("customToken")}isTokenInDb(e){return o(e,"1.0.10")>=0}async getUserRecord(){if(this.userRecord)return this.userRecord;const e=await C.doc(this.uid).get();if(this.userRecord=e.data[0],!this.userRecord)throw{errCode:n.ACCOUNT_NOT_EXISTS};switch(this.userRecord.status){case void 0:case 0:break;case 1:throw{errCode:n.ACCOUNT_BANNED};case 2:throw{errCode:n.ACCOUNT_AUDITING};case 3:throw{errCode:n.ACCOUNT_AUDIT_FAILED};case 4:throw{errCode:n.ACCOUNT_CLOSED}}if(this.oldTokenPayload){if(this.isTokenInDb(this.oldTokenPayload.uniIdVersion)){if(-1===(this.userRecord.token||[]).indexOf(this.oldToken))throw{errCode:n.CHECK_TOKEN_FAILED}}if(this.userRecord.valid_token_date&&this.userRecord.valid_token_date>1e3*this.oldTokenPayload.iat)throw{errCode:n.TOKEN_EXPIRED}}return this.userRecord}async updateUserRecord(e){await C.doc(this.uid).update(e)}async getUserPermission(){if(this.userPermission)return this.userPermission;const e=(await this.getUserRecord()).role||[];if(0===e.length)return this.userPermission={role:[],permission:[]},this.userPermission;if(e.includes("admin"))return this.userPermission={role:e,permission:[]},this.userPermission;const t=await T.where({role_id:I.in(e)}).get(),n=(i=t.data.reduce((e,t)=>(t.permission&&e.push(...t.permission),e),[]),Array.from(new Set(i)));var i;return this.userPermission={role:e,permission:n},this.userPermission}async _createToken({uid:e,role:t,permission:i}={}){if(!t||!i){const e=await this.getUserPermission();t=e.role,i=e.permission}let r={uid:e,role:t,permission:i};if(this.uniId.interceptorMap.has("customToken")){const n=this.uniId.interceptorMap.get("customToken");if("function"!=typeof n)throw new Error("Invalid custom token file");r=await n({uid:e,role:t,permission:i})}const o=Date.now(),{tokenSecret:s,tokenExpiresIn:c,maxTokenLength:a=10}=this.config,u=g({...r,uniIdVersion:"1.0.18"},s,{expiresIn:c}),d=await this.getUserRecord(),l=(d.token||[]).filter(e=>{try{const t=this._checkToken(e);if(d.valid_token_date&&d.valid_token_date>1e3*t.iat)return!1}catch(e){if(e.errCode===n.TOKEN_EXPIRED)return!1}return!0});return l.push(u),l.length>a&&l.splice(0,l.length-a),await this.updateUserRecord({last_login_ip:this.clientInfo.clientIP,last_login_date:o,token:l}),{token:u,tokenExpired:o+1e3*c}}async createToken({uid:e,role:t,permission:i}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"uid"}};this.uid=e;const{token:r,tokenExpired:o}=await this._createToken({uid:e,role:t,permission:i});return{errCode:0,token:r,tokenExpired:o}}async refreshToken({token:e}={}){if(!e)throw{errCode:n.PARAM_REQUIRED,errMsgValue:{param:"token"}};this.oldToken=e;const t=this._checkToken(e);this.uid=t.uid,this.oldTokenPayload=t;const{uid:i}=t,{role:r,permission:o}=await this.getUserPermission(),{token:s,tokenExpired:c}=await this._createToken({uid:i,role:r,permission:o});return{errCode:0,token:s,tokenExpired:c}}_checkToken(e){const{tokenSecret:t}=this.config;let i;try{i=k(e,t)}catch(e){if("TokenExpiredError"===e.name)throw{errCode:n.TOKEN_EXPIRED};throw{errCode:n.CHECK_TOKEN_FAILED}}return i}async checkToken(e,{autoRefresh:t=!0}={}){if(!e)throw{errCode:n.CHECK_TOKEN_FAILED};this.oldToken=e;const i=this._checkToken(e);this.uid=i.uid,this.oldTokenPayload=i;const{tokenExpiresThreshold:r}=this.config,{uid:o,role:s,permission:c}=i,a={role:s,permission:c};if(!s&&!c){const{role:e,permission:t}=await this.getUserPermission();a.role=e,a.permission=t}if(!r||!t){const e={code:0,errCode:0,...i,...a};return delete e.uniIdVersion,e}const u=Date.now();let d={};1e3*i.exp-u<1e3*r&&(d=await this._createToken({uid:o}));const l={code:0,errCode:0,...i,...a,...d};return delete l.uniIdVersion,l}}var m=Object.freeze({__proto__:null,checkToken:async function(e,{autoRefresh:t=!0}={}){return new E({uniId:this}).checkToken(e,{autoRefresh:t})},createToken:async function({uid:e,role:t,permission:n}={}){return new E({uniId:this}).createToken({uid:e,role:t,permission:n})},refreshToken:async function({token:e}={}){return new E({uniId:this}).refreshToken({token:e})}});const w=require("uni-config-center")({pluginId:"uni-id"});class x{constructor({context:e,clientInfo:t,config:n}={}){this._clientInfo=e?function(e){return{appId:e.APPID,platform:e.PLATFORM,locale:e.LOCALE,clientIP:e.CLIENTIP,deviceId:e.DEVICEID}}(e):t,this._config=n,this.config=this._getOriginConfig(),this.interceptorMap=new Map,w.hasFile("custom-token.js")&&this.setInterceptor("customToken",require(w.resolve("custom-token.js")));this._i18n=uniCloud.initI18n({locale:this._clientInfo.locale,fallbackLocale:"zh-Hans",messages:JSON.parse(JSON.stringify(d))}),d[this._i18n.locale]||this._i18n.setLocale("zh-Hans")}setInterceptor(e,t){this.interceptorMap.set(e,t)}_t(...e){return this._i18n.t(...e)}_parseOriginConfig(e){return Array.isArray(e)?e:e[0]?Object.values(e):e}_getOriginConfig(){if(this._config)return this._config;if(w.hasFile("config.json")){let e;try{e=w.config()}catch(e){throw new Error("Invalid uni-id config file\n"+e.message)}return this._parseOriginConfig(e)}try{return this._parseOriginConfig(require("uni-id/config.json"))}catch(e){throw new Error("Invalid uni-id config file")}}_getAppConfig(){const e=this._getOriginConfig();return Array.isArray(e)?e.find(e=>e.dcloudAppid===this._clientInfo.appId)||e.find(e=>e.isDefaultConfig):e}_getPlatformConfig(){const e=this._getAppConfig();if(!e)throw new Error(`Config for current app (${this._clientInfo.appId}) was not found, please check your config file or client appId`);let t;switch(["app-plus","app-android","app-ios"].indexOf(this._clientInfo.platform)>-1&&(this._clientInfo.platform="app"),"h5"===this._clientInfo.platform&&(this._clientInfo.platform="web"),this._clientInfo.platform){case"web":t="h5";break;case"app":t="app-plus"}const n=[{tokenExpiresIn:7200,tokenExpiresThreshold:1200,passwordErrorLimit:6,passwordErrorRetryTime:3600},e];t&&e[t]&&n.push(e[t]),n.push(e[this._clientInfo.platform]);const i=Object.assign(...n);return["tokenSecret","tokenExpiresIn"].forEach(e=>{if(!i||!i[e])throw new Error(`Config parameter missing, ${e} is required`)}),i}_getConfig(){return this._getPlatformConfig()}}for(const e in m)x.prototype[e]=m[e];function y(e){const t=new x(e);return new Proxy(t,{get(e,t){if(t in e&&0!==t.indexOf("_")){if("function"==typeof e[t])return(n=e[t],function(){let e;try{e=n.apply(this,arguments)}catch(e){if(a(e))return c.call(this,e),e;throw e}return i(e)?e.then(e=>(a(e)&&c.call(this,e),e),e=>{if(a(e))return c.call(this,e),e;throw e}):(a(e)&&c.call(this,e),e)}).bind(e);if("context"!==t&&"config"!==t)return e[t]}var n}})}x.prototype.createInstance=y;const O={createInstance:y};module.exports=O;
+"use strict";
+var e, t = (e = require("crypto")) && "object" == typeof e && "default" in e ? e.default : e;
+const n = {
+	TOKEN_EXPIRED: "uni-id-token-expired",
+	CHECK_TOKEN_FAILED: "uni-id-check-token-failed",
+	PARAM_REQUIRED: "uni-id-param-required",
+	ACCOUNT_EXISTS: "uni-id-account-exists",
+	ACCOUNT_NOT_EXISTS: "uni-id-account-not-exists",
+	ACCOUNT_CONFLICT: "uni-id-account-conflict",
+	ACCOUNT_BANNED: "uni-id-account-banned",
+	ACCOUNT_AUDITING: "uni-id-account-auditing",
+	ACCOUNT_AUDIT_FAILED: "uni-id-account-audit-failed",
+	ACCOUNT_CLOSED: "uni-id-account-closed"
+};
+
+function i(e) {
+	return !!e && ("object" == typeof e || "function" == typeof e) && "function" == typeof e.then
+}
+
+function r(e) {
+	if (!e) return;
+	const t = e.match(/^(\d+).(\d+).(\d+)/);
+	return t ? t.slice(1, 4).map(e => parseInt(e)) : void 0
+}
+
+function o(e, t) {
+	const n = r(e),
+		i = r(t);
+	return n ? i ? function(e, t) {
+		const n = Math.max(e.length, t.length);
+		for (let i = 0; i < n; i++) {
+			const n = e[i],
+				r = t[i];
+			if (n > r) return 1;
+			if (n < r) return -1
+		}
+		return 0
+	}(n, i) : 1 : i ? -1 : 0
+}
+const s = {
+	"uni-id-token-expired": 30203,
+	"uni-id-check-token-failed": 30202
+};
+
+function c(e) {
+	const {
+		errCode: t,
+		errMsgValue: n
+	} = e;
+	e.errMsg = this._t(t, n), t in s && (e.code = s[t]), delete e.errMsgValue
+}
+
+function a(e) {
+	return "object" === (i = e, Object.prototype.toString.call(i).slice(8, -1).toLowerCase()) && e.errCode && (t = e
+		.errCode, Object.values(n).includes(t)) && !!e.errCode;
+	var t, i
+}
+let u = {
+	"zh-Hans": {
+		"uni-id-token-expired": "登录状态失效，token已过期",
+		"uni-id-check-token-failed": "token校验未通过",
+		"uni-id-param-required": "缺少参数: {param}",
+		"uni-id-account-exists": "此账号已注册",
+		"uni-id-account-not-exists": "此账号未注册",
+		"uni-id-account-conflict": "用户账号冲突",
+		"uni-id-account-banned": "从账号已封禁",
+		"uni-id-account-auditing": "此账号正在审核中",
+		"uni-id-account-audit-failed": "此账号审核失败",
+		"uni-id-account-closed": "此账号已注销"
+	},
+	en: {
+		"uni-id-token-expired": "The login status is invalid, token has expired",
+		"uni-id-check-token-failed": "Check token failed",
+		"uni-id-param-required": "Parameter required: {param}",
+		"uni-id-account-exists": "Account exists",
+		"uni-id-account-not-exists": "Account does not exists",
+		"uni-id-account-conflict": "User account conflict",
+		"uni-id-account-banned": "Account has been banned",
+		"uni-id-account-auditing": "Account audit in progress",
+		"uni-id-account-audit-failed": "Account audit failed",
+		"uni-id-account-closed": "Account has been closed"
+	}
+};
+try {
+	const e = require.resolve("uni-config-center/uni-id/lang/index.js");
+	u = function(e, t) {
+		const n = Object.keys(e);
+		n.push(...Object.keys(t));
+		const i = {};
+		for (let r = 0; r < n.length; r++) {
+			const o = n[r];
+			i[o] = Object.assign({}, e[o], t[o])
+		}
+		return i
+	}(u, require(e))
+} catch (e) {}
+var d = u;
+
+function l(e) {
+	return e.replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_")
+}
+
+function h(e) {
+	return JSON.parse((t = function(e) {
+		var t = 4 - (e = e.toString()).length % 4;
+		if (4 !== t)
+			for (var n = 0; n < t; ++n) e += "=";
+		return e.replace(/-/g, "+").replace(/_/g, "/")
+	}(e), Buffer.from(t, "base64").toString("utf-8")));
+	var t
+}
+
+function f(e) {
+	return l((t = JSON.stringify(e), Buffer.from(t, "utf-8").toString("base64")));
+	var t
+}
+
+function p(e, n) {
+	return l(t.createHmac("sha256", n).update(e).digest("base64"))
+}
+const k = function(e, t) {
+		if ("string" != typeof e) throw new Error("Invalid token");
+		const n = e.split(".");
+		if (3 !== n.length) throw new Error("Invalid token");
+		const [i, r, o] = n;
+		if (p(i + "." + r, t) !== o) throw new Error("Invalid token");
+		const s = h(i);
+		if ("HS256" !== s.alg || "JWT" !== s.typ) throw new Error("Invalid token");
+		const c = h(r);
+		if (1e3 * c.exp < Date.now()) {
+			const e = new Error("Token expired");
+			throw e.name = "TokenExpiredError", e
+		}
+		return c
+	},
+	g = function(e, t, n = {}) {
+		const {
+			expiresIn: i
+		} = n;
+		if (!i) throw new Error("expiresIn is required");
+		const r = parseInt(Date.now() / 1e3),
+			o = {
+				...e,
+				iat: r,
+				exp: r + n.expiresIn
+			},
+			s = f({
+				alg: "HS256",
+				typ: "JWT"
+			}) + "." + f(o);
+		return s + "." + p(s, t)
+	},
+	_ = uniCloud.database(),
+	I = _.command,
+	C = _.collection("uni-id-users"),
+	T = _.collection("uni-id-roles");
+class E {
+	constructor({
+		uniId: e
+	} = {}) {
+		this.uid = null, this.userRecord = null, this.userPermission = null, this.oldToken = null, this
+			.oldTokenPayload = null, this.uniId = e, this.config = this.uniId._getConfig(), this.clientInfo = this
+			.uniId._clientInfo, this.checkConfig()
+	}
+	checkConfig() {
+		const {
+			tokenExpiresIn: e,
+			tokenExpiresThreshold: t
+		} = this.config;
+		if (t >= e) throw new Error("Config error, tokenExpiresThreshold should be less than tokenExpiresIn");
+		t > e / 2 && console.warn(
+			`Please check whether the tokenExpiresThreshold configuration is set too large, tokenExpiresThreshold: ${t}, tokenExpiresIn: ${e}`
+		)
+	}
+	get customToken() {
+		return this.uniId.interceptorMap.get("customToken")
+	}
+	isTokenInDb(e) {
+		return o(e, "1.0.10") >= 0
+	}
+	async getUserRecord() {
+		if (this.userRecord) return this.userRecord;
+		const e = await C.doc(this.uid).get();
+		if (this.userRecord = e.data[0], !this.userRecord) throw {
+			errCode: n.ACCOUNT_NOT_EXISTS
+		};
+		switch (this.userRecord.status) {
+			case void 0:
+			case 0:
+				break;
+			case 1:
+				throw {
+					errCode: n.ACCOUNT_BANNED
+				};
+			case 2:
+				throw {
+					errCode: n.ACCOUNT_AUDITING
+				};
+			case 3:
+				throw {
+					errCode: n.ACCOUNT_AUDIT_FAILED
+				};
+			case 4:
+				throw {
+					errCode: n.ACCOUNT_CLOSED
+				}
+		}
+		if (this.oldTokenPayload) {
+			if (this.isTokenInDb(this.oldTokenPayload.uniIdVersion)) {
+				if (-1 === (this.userRecord.token || []).indexOf(this.oldToken)) throw {
+					errCode: n.CHECK_TOKEN_FAILED
+				}
+			}
+			if (this.userRecord.valid_token_date && this.userRecord.valid_token_date > 1e3 * this.oldTokenPayload
+				.iat) throw {
+				errCode: n.TOKEN_EXPIRED
+			}
+		}
+		return this.userRecord
+	}
+	async updateUserRecord(e) {
+		await C.doc(this.uid).update(e)
+	}
+	async getUserPermission() {
+		if (this.userPermission) return this.userPermission;
+		const e = (await this.getUserRecord()).role || [];
+		if (0 === e.length) return this.userPermission = {
+			role: [],
+			permission: []
+		}, this.userPermission;
+		if (e.includes("admin")) return this.userPermission = {
+			role: e,
+			permission: []
+		}, this.userPermission;
+		const t = await T.where({
+				role_id: I.in(e)
+			}).get(),
+			n = (i = t.data.reduce((e, t) => (t.permission && e.push(...t.permission), e), []), Array.from(new Set(
+				i)));
+		var i;
+		return this.userPermission = {
+			role: e,
+			permission: n
+		}, this.userPermission
+	}
+	async _createToken({
+		uid: e,
+		role: t,
+		permission: i
+	} = {}) {
+		if (!t || !i) {
+			const e = await this.getUserPermission();
+			t = e.role, i = e.permission
+		}
+		let r = {
+			uid: e,
+			role: t,
+			permission: i
+		};
+		if (this.uniId.interceptorMap.has("customToken")) {
+			const n = this.uniId.interceptorMap.get("customToken");
+			if ("function" != typeof n) throw new Error("Invalid custom token file");
+			r = await n({
+				uid: e,
+				role: t,
+				permission: i
+			})
+		}
+		const o = Date.now(),
+			{
+				tokenSecret: s,
+				tokenExpiresIn: c,
+				maxTokenLength: a = 10
+			} = this.config,
+			u = g({
+				...r,
+				uniIdVersion: "1.0.18"
+			}, s, {
+				expiresIn: c
+			}),
+			d = await this.getUserRecord(),
+			l = (d.token || []).filter(e => {
+				try {
+					const t = this._checkToken(e);
+					if (d.valid_token_date && d.valid_token_date > 1e3 * t.iat) return !1
+				} catch (e) {
+					if (e.errCode === n.TOKEN_EXPIRED) return !1
+				}
+				return !0
+			});
+		return l.push(u), l.length > a && l.splice(0, l.length - a), await this.updateUserRecord({
+			last_login_ip: this.clientInfo.clientIP,
+			last_login_date: o,
+			token: l
+		}), {
+			token: u,
+			tokenExpired: o + 1e3 * c
+		}
+	}
+	async createToken({
+		uid: e,
+		role: t,
+		permission: i
+	} = {}) {
+		if (!e) throw {
+			errCode: n.PARAM_REQUIRED,
+			errMsgValue: {
+				param: "uid"
+			}
+		};
+		this.uid = e;
+		const {
+			token: r,
+			tokenExpired: o
+		} = await this._createToken({
+			uid: e,
+			role: t,
+			permission: i
+		});
+		return {
+			errCode: 0,
+			token: r,
+			tokenExpired: o
+		}
+	}
+	async refreshToken({
+		token: e
+	} = {}) {
+		if (!e) throw {
+			errCode: n.PARAM_REQUIRED,
+			errMsgValue: {
+				param: "token"
+			}
+		};
+		this.oldToken = e;
+		const t = this._checkToken(e);
+		this.uid = t.uid, this.oldTokenPayload = t;
+		const {
+			uid: i
+		} = t, {
+			role: r,
+			permission: o
+		} = await this.getUserPermission(), {
+			token: s,
+			tokenExpired: c
+		} = await this._createToken({
+			uid: i,
+			role: r,
+			permission: o
+		});
+		return {
+			errCode: 0,
+			token: s,
+			tokenExpired: c
+		}
+	}
+	_checkToken(e) {
+		const {
+			tokenSecret: t
+		} = this.config;
+		let i;
+		try {
+			i = k(e, t)
+		} catch (e) {
+			if ("TokenExpiredError" === e.name) throw {
+				errCode: n.TOKEN_EXPIRED
+			};
+			throw {
+				errCode: n.CHECK_TOKEN_FAILED
+			}
+		}
+		return i
+	}
+	async checkToken(e, {
+		autoRefresh: t = !0
+	} = {}) {
+		if (!e) throw {
+			errCode: n.CHECK_TOKEN_FAILED
+		};
+		this.oldToken = e;
+		const i = this._checkToken(e);
+		this.uid = i.uid, this.oldTokenPayload = i;
+		const {
+			tokenExpiresThreshold: r
+		} = this.config, {
+			uid: o,
+			role: s,
+			permission: c
+		} = i, a = {
+			role: s,
+			permission: c
+		};
+		if (!s && !c) {
+			const {
+				role: e,
+				permission: t
+			} = await this.getUserPermission();
+			a.role = e, a.permission = t
+		}
+		if (!r || !t) {
+			const e = {
+				code: 0,
+				errCode: 0,
+				...i,
+				...a
+			};
+			return delete e.uniIdVersion, e
+		}
+		const u = Date.now();
+		let d = {};
+		1e3 * i.exp - u < 1e3 * r && (d = await this._createToken({
+			uid: o
+		}));
+		const l = {
+			code: 0,
+			errCode: 0,
+			...i,
+			...a,
+			...d
+		};
+		return delete l.uniIdVersion, l
+	}
+}
+var m = Object.freeze({
+	__proto__: null,
+	checkToken: async function(e, {
+		autoRefresh: t = !0
+	} = {}) {
+		return new E({
+			uniId: this
+		}).checkToken(e, {
+			autoRefresh: t
+		})
+	},
+	createToken: async function({
+		uid: e,
+		role: t,
+		permission: n
+	} = {}) {
+		return new E({
+			uniId: this
+		}).createToken({
+			uid: e,
+			role: t,
+			permission: n
+		})
+	},
+	refreshToken: async function({
+		token: e
+	} = {}) {
+		return new E({
+			uniId: this
+		}).refreshToken({
+			token: e
+		})
+	}
+});
+const w = require("uni-config-center")({
+	pluginId: "uni-id"
+});
+class x {
+	constructor({
+		context: e,
+		clientInfo: t,
+		config: n
+	} = {}) {
+		this._clientInfo = e ? function(e) {
+				return {
+					appId: e.APPID,
+					platform: e.PLATFORM,
+					locale: e.LOCALE,
+					clientIP: e.CLIENTIP,
+					deviceId: e.DEVICEID
+				}
+			}(e) : t, this._config = n, this.config = this._getOriginConfig(), this.interceptorMap = new Map, w
+			.hasFile("custom-token.js") && this.setInterceptor("customToken", require(w.resolve(
+				"custom-token.js")));
+		this._i18n = uniCloud.initI18n({
+			locale: this._clientInfo.locale,
+			fallbackLocale: "zh-Hans",
+			messages: JSON.parse(JSON.stringify(d))
+		}), d[this._i18n.locale] || this._i18n.setLocale("zh-Hans")
+	}
+	setInterceptor(e, t) {
+		this.interceptorMap.set(e, t)
+	}
+	_t(...e) {
+		return this._i18n.t(...e)
+	}
+	_parseOriginConfig(e) {
+		return Array.isArray(e) ? e : e[0] ? Object.values(e) : e
+	}
+	_getOriginConfig() {
+		if (this._config) return this._config;
+		if (w.hasFile("config.json")) {
+			let e;
+			try {
+				e = w.config()
+			} catch (e) {
+				throw new Error("Invalid uni-id config file\n" + e.message)
+			}
+			return this._parseOriginConfig(e)
+		}
+		try {
+			return this._parseOriginConfig(require("uni-id/config.json"))
+		} catch (e) {
+			throw new Error("Invalid uni-id config file")
+		}
+	}
+	_getAppConfig() {
+		const e = this._getOriginConfig();
+		return Array.isArray(e) ? e.find(e => e.dcloudAppid === this._clientInfo.appId) || e.find(e => e
+			.isDefaultConfig) : e
+	}
+	_getPlatformConfig() {
+		const e = this._getAppConfig();
+		if (!e) throw new Error(
+			`Config for current app (${this._clientInfo.appId}) was not found, please check your config file or client appId`
+		);
+		let t;
+		switch (["app-plus", "app-android", "app-ios"].indexOf(this._clientInfo.platform) > -1 && (this._clientInfo
+				.platform = "app"), "h5" === this._clientInfo.platform && (this._clientInfo.platform = "web"), this
+			._clientInfo.platform) {
+			case "web":
+				t = "h5";
+				break;
+			case "app":
+				t = "app-plus"
+		}
+		const n = [{
+			tokenExpiresIn: 7200,
+			tokenExpiresThreshold: 1200,
+			passwordErrorLimit: 6,
+			passwordErrorRetryTime: 3600
+		}, e];
+		t && e[t] && n.push(e[t]), n.push(e[this._clientInfo.platform]);
+		const i = Object.assign(...n);
+		return ["tokenSecret", "tokenExpiresIn"].forEach(e => {
+			if (!i || !i[e]) throw new Error(`Config parameter missing, ${e} is required`)
+		}), i
+	}
+	_getConfig() {
+		return this._getPlatformConfig()
+	}
+}
+for (const e in m) x.prototype[e] = m[e];
+
+function y(e) {
+	const t = new x(e);
+	return new Proxy(t, {
+		get(e, t) {
+			if (t in e && 0 !== t.indexOf("_")) {
+				if ("function" == typeof e[t]) return (n = e[t], function() {
+					let e;
+					try {
+						e = n.apply(this, arguments)
+					} catch (e) {
+						if (a(e)) return c.call(this, e), e;
+						throw e
+					}
+					return i(e) ? e.then(e => (a(e) && c.call(this, e), e), e => {
+						if (a(e)) return c.call(this, e), e;
+						throw e
+					}) : (a(e) && c.call(this, e), e)
+				}).bind(e);
+				if ("context" !== t && "config" !== t) return e[t]
+			}
+			var n
+		}
+	})
+}
+x.prototype.createInstance = y;
+const O = {
+	createInstance: y
+};
+module.exports = O;
\ No newline at end of file
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
index 9688abf..d456953 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
@@ -1,568 +1,565 @@
 <template>
 	<view>
 		<view class="fab-login-box">
-			<view class="item" v-for="(item,index) in servicesList" :key="index"
-				@click="item.path?toPage(item.path):login_before(item.id,false)">
+			<view class="item" v-for="(item, index) in servicesList" :key="index" @click="item.path ? toPage(item.path) : login_before(item.id, false)">
 				<image class="logo" :src="item.logo" mode="scaleToFill"></image>
-				<text class="login-title">{{item.text}}</text>
+				<text class="login-title">{{ item.text }}</text>
 			</view>
 		</view>
 	</view>
 </template>
 <script>
-	import config from '@/uni_modules/uni-id-pages/config.js'
-	//前一个窗口的页面地址。控制点击切换快捷登录方式是创建还是返回
-	import {store,mutations} from '@/uni_modules/uni-id-pages/common/store.js'
-	let allServicesList = []
-	export default {
-		computed: {
-			agreements() {
-				if (!config.agreements) {
-					return []
-				}
-				let {
-					serviceUrl,
-					privacyUrl
-				} = config.agreements
-				return [{
-						url: serviceUrl,
-						title: "用户服务协议"
-					},
-					{
-						url: privacyUrl,
-						title: "隐私政策条款"
-					}
-				]
-			},
-			agree: {
-				get() {
-					return this.getParentComponent().agree
+import config from '@/uni_modules/uni-id-pages/config.js';
+//前一个窗口的页面地址。控制点击切换快捷登录方式是创建还是返回
+import { store, mutations } from '@/uni_modules/uni-id-pages/common/store.js';
+let allServicesList = [];
+export default {
+	computed: {
+		agreements() {
+			if (!config.agreements) {
+				return [];
+			}
+			let { serviceUrl, privacyUrl } = config.agreements;
+			return [
+				{
+					url: serviceUrl,
+					title: '用户服务协议'
 				},
-				set(agree) {
-					return this.getParentComponent().agree = agree
+				{
+					url: privacyUrl,
+					title: '隐私政策条款'
 				}
-			}
+			];
 		},
-		data() {
-			return {
-				servicesList: [{
-						"id": "username",
-						"text": "账号登录",
-						"logo": "/uni_modules/uni-id-pages/static/login/uni-fab-login/user.png",
-						"path": "/uni_modules/uni-id-pages/pages/login/login-withpwd"
-					},
-					{
-						"id": "smsCode",
-						"text": "短信验证码",
-						"logo": "/uni_modules/uni-id-pages/static/login/uni-fab-login/sms.png",
-						"path": "/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=smsCode"
-					},
-					{
-						"id": "weixin",
-						"text": "微信登录",
-						"logo": "/uni_modules/uni-id-pages/static/login/uni-fab-login/weixin.png",
-					},
-					// #ifndef MP-WEIXIN
-					{
-						"id": "apple",
-						"text": "苹果登录",
-						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/apple.png",
-					},
-					{
-						"id": "univerify",
-						"text": "一键登录",
-						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/univerify.png",
-					},
-					{
-						"id": "taobao",
-						"text": "淘宝登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/taobao.png",
-					},
-					{
-						"id": "facebook",
-						"text": "脸书登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/facebook.png",
-					},
-					{
-						"id": "alipay",
-						"text": "支付宝登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/alipay.png",
-					},
-					{
-						"id": "qq",
-						"text": "QQ登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/qq.png",
-					},
-					{
-						"id": "google",
-						"text": "谷歌登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/google.png",
-					},
-					{
-						"id": "douyin",
-						"text": "抖音登录", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/douyin.png",
-					},
-					{
-						"id": "sinaweibo",
-						"text": "新浪微博", //暂未提供该登录方式的接口示例
-						"logo": "/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/sinaweibo.png",
-					}
-					// #endif
-				],
-				univerifyStyle: { //一键登录弹出窗的样式配置参数
-					"fullScreen": true, // 是否全屏显示，true表示全屏模式，false表示非全屏模式，默认值为false。
-					"backgroundColor": "#ffffff", // 授权页面背景颜色，默认值：#ffffff
-					"buttons": { // 自定义登录按钮
-						"iconWidth": "45px", // 图标宽度（高度等比例缩放） 默认值：45px
-						"list": []
-					},
-					"privacyTerms": {
-						"defaultCheckBoxState": false, // 条款勾选框初始状态 默认值： true
-						"textColor": "#BBBBBB", // 文字颜色 默认值：#BBBBBB
-						"termsColor": "#5496E3", //  协议文字颜色 默认值： #5496E3
-						"prefix": "我已阅读并同意", // 条款前的文案 默认值：“我已阅读并同意”
-						"suffix": "并使用本机号码登录", // 条款后的文案 默认值：“并使用本机号码登录”
-						"privacyItems": []
-					}
-				}
+		agree: {
+			get() {
+				return this.getParentComponent().agree;
+			},
+			set(agree) {
+				return (this.getParentComponent().agree = agree);
 			}
-		},
-		watch: {
-			agree(agree) {
-				this.univerifyStyle.privacyTerms.defaultCheckBoxState = agree
-			}
-		},
-		async created() {
-			let servicesList = this.servicesList
-			let loginTypes = config.loginTypes
-
-			servicesList = servicesList.filter(item => {
-
-				// #ifndef APP
-				//非app端去掉apple登录
-				if (item.id == 'apple') {
-					return false
+		}
+	},
+	data() {
+		return {
+			servicesList: [
+				{
+					id: 'username',
+					text: '账号登录',
+					logo: '/uni_modules/uni-id-pages/static/login/uni-fab-login/user.png',
+					path: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+				},
+				{
+					id: 'smsCode',
+					text: '短信验证码',
+					logo: '/uni_modules/uni-id-pages/static/login/uni-fab-login/sms.png',
+					path: '/uni_modules/uni-id-pages/pages/login/login-withoutpwd?type=smsCode'
+				},
+				{
+					id: 'weixin',
+					text: '微信登录',
+					logo: '/uni_modules/uni-id-pages/static/login/uni-fab-login/weixin.png'
+				},
+				// #ifndef MP-WEIXIN
+				{
+					id: 'apple',
+					text: '苹果登录',
+					logo: '/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/apple.png'
+				},
+				{
+					id: 'univerify',
+					text: '一键登录',
+					logo: '/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/univerify.png'
+				},
+				{
+					id: 'taobao',
+					text: '淘宝登录', //暂未提供该登录方式的接口示例
+					logo: '/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/taobao.png'
+				},
+				{
+					id: 'facebook',
+					text: '脸书登录', //暂未提供该登录方式的接口示例
+					logo: '/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/facebook.png'
+				},
+				{
+					id: 'alipay',
+					text: '支付宝登录', //暂未提供该登录方式的接口示例
+					logo: '/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/alipay.png'
+				},
+				{
+					id: 'qq',
+					text: 'QQ登录', //暂未提供该登录方式的接口示例
+					logo: '/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/qq.png'
+				},
+				{
+					id: 'google',
+					text: '谷歌登录', //暂未提供该登录方式的接口示例
+					logo: '/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/google.png'
+				},
+				{
+					id: 'douyin',
+					text: '抖音登录', //暂未提供该登录方式的接口示例
+					logo: '/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/douyin.png'
+				},
+				{
+					id: 'sinaweibo',
+					text: '新浪微博', //暂未提供该登录方式的接口示例
+					logo: '/uni_modules/uni-id-pages/static/app-plus/uni-fab-login/sinaweibo.png'
 				}
 				// #endif
-
-				// #ifdef APP
-				//去掉非ios系统上的apple登录
-				if (item.id == 'apple' && uni.getSystemInfoSync().osName != 'ios') {
-					return false
+			],
+			univerifyStyle: {
+				//一键登录弹出窗的样式配置参数
+				fullScreen: true, // 是否全屏显示，true表示全屏模式，false表示非全屏模式，默认值为false。
+				backgroundColor: '#ffffff', // 授权页面背景颜色，默认值：#ffffff
+				buttons: {
+					// 自定义登录按钮
+					iconWidth: '45px', // 图标宽度（高度等比例缩放） 默认值：45px
+					list: []
+				},
+				privacyTerms: {
+					defaultCheckBoxState: false, // 条款勾选框初始状态 默认值： true
+					textColor: '#BBBBBB', // 文字颜色 默认值：#BBBBBB
+					termsColor: '#5496E3', //  协议文字颜色 默认值： #5496E3
+					prefix: '我已阅读并同意', // 条款前的文案 默认值：“我已阅读并同意”
+					suffix: '并使用本机号码登录', // 条款后的文案 默认值：“并使用本机号码登录”
+					privacyItems: []
 				}
-				// #endif
-
-				return loginTypes.includes(item.id)
-			})
-			//处理一键登录
-			if (loginTypes.includes('univerify')) {
-				this.univerifyStyle.privacyTerms.privacyItems = this.agreements
-				//设置一键登录功能底下的快捷登录按钮
-				servicesList.forEach(({
-					id,
-					logo,
-					path
-				}) => {
-					if (id != 'univerify') {
-						this.univerifyStyle.buttons.list.push({
-							"iconPath": logo,
-							"provider": id,
-							path //路径用于点击快捷按钮时判断是跳转页面
-						})
-					}
-				})
 			}
-			//	console.log(servicesList);
+		};
+	},
+	watch: {
+		agree(agree) {
+			this.univerifyStyle.privacyTerms.defaultCheckBoxState = agree;
+		}
+	},
+	async created() {
+		let servicesList = this.servicesList;
+		let loginTypes = config.loginTypes;
 
-			//去掉当前页面对应的登录选项
-			this.servicesList = servicesList.filter(item => {
-				let path = item.path ? item.path.split('?')[0] : '';
-				return path != this.getRoute(1)
-			})
-		},
-		methods: {
-			getParentComponent(){
-				// #ifndef H5
-				return this.$parent;
-				// #endif
+		servicesList = servicesList.filter((item) => {
+			// #ifndef APP
+			//非app端去掉apple登录
+			if (item.id == 'apple') {
+				return false;
+			}
+			// #endif
 
-				// #ifdef H5
-				return this.$parent.$parent;
-				// #endif
-			},
-			setUserInfo(e) {
-				console.log('setUserInfo', e);
-			},
-			getRoute(n = 0) {
-				let pages = getCurrentPages();
-				if (n > pages.length) {
-					return ''
-				}
-				return '/' + pages[pages.length - n].route
-			},
-			toPage(path,index = 0) {
-				//console.log('比较', this.getRoute(1),this.getRoute(2), path)
-				if (this.getRoute(1) == path.split('?')[0] && this.getRoute(1) ==
-					'/uni_modules/uni-id-pages/pages/login/login-withoutpwd') {
-					//如果要被打开的页面已经打开，且这个页面是 /uni_modules/uni-id-pages/pages/index/index 则把类型参数传给他
-					let loginType = path.split('?')[1].split('=')[1]
-					uni.$emit('uni-id-pages-setLoginType', loginType)
-				} else if (this.getRoute(2) == path) { // 如果上一个页面就是，马上要打开的页面，直接返回。防止重复开启
-					uni.navigateBack();
-				} else if (this.getRoute(1) != path) {
-					if(index === 0){
-						uni.navigateTo({
-							url: path,
-							animationType: 'slide-in-left',
-							complete(e) {
-								// console.log(e);
-							}
-						})
-					}else{
-						uni.redirectTo({
-							url: path,
-							animationType: 'slide-in-left',
-							complete(e) {
-								// console.log(e);
-							}
-						})
-					}
-				} else {
-					console.log('出乎意料的情况,path：' + path);
-				}
-			},
-			async login_before(type, navigateBack = true, options = {}) {
-				console.log(type);
-				//提示空实现
-				if (["qq",
-						"xiaomi",
-						"sinaweibo",
-						"taobao",
-						"facebook",
-						"google",
-						"alipay",
-						"douyin",
-					].includes(type)) {
-					return uni.showToast({
-						title: '该登录方式暂未实现，欢迎提交pr',
-						icon: 'none',
-						duration: 3000
+			// #ifdef APP
+			//去掉非ios系统上的apple登录
+			if (item.id == 'apple' && uni.getSystemInfoSync().osName != 'ios') {
+				return false;
+			}
+			// #endif
+
+			return loginTypes.includes(item.id);
+		});
+		//处理一键登录
+		if (loginTypes.includes('univerify')) {
+			this.univerifyStyle.privacyTerms.privacyItems = this.agreements;
+			//设置一键登录功能底下的快捷登录按钮
+			servicesList.forEach(({ id, logo, path }) => {
+				if (id != 'univerify') {
+					this.univerifyStyle.buttons.list.push({
+						iconPath: logo,
+						provider: id,
+						path //路径用于点击快捷按钮时判断是跳转页面
 					});
 				}
+			});
+		}
+		//	console.log(servicesList);
 
-				//检查当前环境是否支持这种登录方式
-				// #ifdef APP
-				let isAppExist = true
-				await new Promise((callback) => {
-					plus.oauth.getServices(oauthServices => {
-						let index = oauthServices.findIndex(e => e.id == type)
-						if(index != -1){
-							isAppExist = oauthServices[index].nativeClient
-							callback()
-						}else{
+		//去掉当前页面对应的登录选项
+		this.servicesList = servicesList.filter((item) => {
+			let path = item.path ? item.path.split('?')[0] : '';
+			return path != this.getRoute(1);
+		});
+	},
+	methods: {
+		getParentComponent() {
+			// #ifndef H5
+			return this.$parent;
+			// #endif
+
+			// #ifdef H5
+			return this.$parent.$parent;
+			// #endif
+		},
+		setUserInfo(e) {
+			console.log('setUserInfo', e);
+		},
+		getRoute(n = 0) {
+			let pages = getCurrentPages();
+			if (n > pages.length) {
+				return '';
+			}
+			return '/' + pages[pages.length - n].route;
+		},
+		toPage(path, index = 0) {
+			//console.log('比较', this.getRoute(1),this.getRoute(2), path)
+			if (this.getRoute(1) == path.split('?')[0] && this.getRoute(1) == '/uni_modules/uni-id-pages/pages/login/login-withoutpwd') {
+				//如果要被打开的页面已经打开，且这个页面是 /uni_modules/uni-id-pages/pages/index/index 则把类型参数传给他
+				let loginType = path.split('?')[1].split('=')[1];
+				uni.$emit('uni-id-pages-setLoginType', loginType);
+			} else if (this.getRoute(2) == path) {
+				// 如果上一个页面就是，马上要打开的页面，直接返回。防止重复开启
+				uni.navigateBack();
+			} else if (this.getRoute(1) != path) {
+				if (index === 0) {
+					uni.navigateTo({
+						url: path,
+						animationType: 'slide-in-left',
+						complete(e) {
+							// console.log(e);
+						}
+					});
+				} else {
+					uni.redirectTo({
+						url: path,
+						animationType: 'slide-in-left',
+						complete(e) {
+							// console.log(e);
+						}
+					});
+				}
+			} else {
+				console.log('出乎意料的情况,path：' + path);
+			}
+		},
+		async login_before(type, navigateBack = true, options = {}) {
+			console.log(type);
+			//提示空实现
+			if (['qq', 'xiaomi', 'sinaweibo', 'taobao', 'facebook', 'google', 'alipay', 'douyin'].includes(type)) {
+				return uni.showToast({
+					title: '该登录方式暂未实现，欢迎提交pr',
+					icon: 'none',
+					duration: 3000
+				});
+			}
+
+			//检查当前环境是否支持这种登录方式
+			// #ifdef APP
+			let isAppExist = true;
+			await new Promise((callback) => {
+				plus.oauth.getServices(
+					(oauthServices) => {
+						let index = oauthServices.findIndex((e) => e.id == type);
+						if (index != -1) {
+							isAppExist = oauthServices[index].nativeClient;
+							callback();
+						} else {
 							return uni.showToast({
 								title: '当前设备不支持此登录，请选择其他登录方式',
 								icon: 'none',
 								duration: 3000
 							});
 						}
-					}, err => {
-						throw new Error('获取服务供应商失败：' + JSON.stringify(err))
-					})
-				})
-				// #endif
+					},
+					(err) => {
+						throw new Error('获取服务供应商失败：' + JSON.stringify(err));
+					}
+				);
+			});
+			// #endif
 
-				if (
-					// #ifdef APP
-					!isAppExist
+			if (
+				// #ifdef APP
+				!isAppExist[]
 					// #endif
-
 					//非app端使用了，app特有登录方式
 					// #ifndef APP
-					["univerify","apple"].includes(type)
-					// #endif
+					('univerify', 'apple')
+				.includes(type)
+				// #endif
+			) {
+				return uni.showToast({
+					title: '当前设备不支持此登录，请选择其他登录方式',
+					icon: 'none',
+					duration: 3000
+				});
+			}
 
-				) {
-					return uni.showToast({
-						title: '当前设备不支持此登录，请选择其他登录方式',
-						icon: 'none',
-						duration: 3000
-					});
-				}
+			//判断是否需要弹出隐私协议授权框
+			let needAgreements = (config?.agreements?.scope || []).includes('register');
+			if (type != 'univerify' && needAgreements && !this.agree) {
+				let agreementsRef = this.getParentComponent().$refs.agreements;
+				return agreementsRef.popup(() => {
+					this.login_before(type, navigateBack, options);
+				});
+			}
 
-				//判断是否需要弹出隐私协议授权框
-				let needAgreements = (config?.agreements?.scope || []).includes('register')
-				if (type != 'univerify' && needAgreements && !this.agree) {
-					let agreementsRef = this.getParentComponent().$refs.agreements
-					return agreementsRef.popup(() => {
-						this.login_before(type, navigateBack, options)
-					})
-				}
+			// #ifdef H5
+			if (type == 'weixin') {
+				// console.log('开始微信网页登录');
+				// let redirectUrl = location.protocol +'//'+
+				// 				document.domain +
+				// 				(window.location.href.includes('#')?'/#':'') +
+				// 				'/uni_modules/uni-id-pages/pages/login/login-withoutpwd?is_weixin_redirect=true&type=weixin'
+				// #ifdef VUE2
+				const baseUrl = process.env.BASE_URL;
+				// #endif
+				// #ifdef VUE3
+				const baseUrl = import.meta.env.BASE_URL;
+				// #endif
 
-				// #ifdef H5
-					if(type == 'weixin'){
-						// console.log('开始微信网页登录');
-						// let redirectUrl = location.protocol +'//'+
-						// 				document.domain +
-						// 				(window.location.href.includes('#')?'/#':'') +
-						// 				'/uni_modules/uni-id-pages/pages/login/login-withoutpwd?is_weixin_redirect=true&type=weixin'
-            // #ifdef VUE2
-            const baseUrl = process.env.BASE_URL
-            // #endif
-            // #ifdef VUE3
-            const baseUrl = import.meta.env.BASE_URL
-            // #endif
+				let redirectUrl =
+					location.protocol +
+					'//' +
+					location.host +
+					baseUrl.replace(/\/$/, '') +
+					(window.location.href.includes('#') ? '/#' : '') +
+					'/uni_modules/uni-id-pages/pages/login/login-withoutpwd?is_weixin_redirect=true&type=weixin';
 
-            let redirectUrl = location.protocol +
-                '//' +
-                location.host +
-                baseUrl.replace(/\/$/, '') +
-                (window.location.href.includes('#')?'/#':'') +
-                '/uni_modules/uni-id-pages/pages/login/login-withoutpwd?is_weixin_redirect=true&type=weixin'
-
-						// console.log('redirectUrl----',redirectUrl);
-						let ua = window.navigator.userAgent.toLowerCase();
-						if (ua.match(/MicroMessenger/i) == 'micromessenger'){
-							// console.log('在微信公众号内');
-							return window.open(`https://open.weixin.qq.com/connect/oauth2/authorize?
+				// console.log('redirectUrl----',redirectUrl);
+				let ua = window.navigator.userAgent.toLowerCase();
+				if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+					// console.log('在微信公众号内');
+					return window.open(`https://open.weixin.qq.com/connect/oauth2/authorize?
 										appid=${config.appid.weixin.h5}
 										&redirect_uri=${encodeURIComponent(redirectUrl)}
 										&response_type=code
 										&scope=snsapi_userinfo
 										&state=STATE&connect_redirect=1#wechat_redirect`);
-
-						}else{
-							// console.log('非微信公众号内');
-							return location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=${config.appid.weixin.web}
+				} else {
+					// console.log('非微信公众号内');
+					return (location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=${config.appid.weixin.web}
 											&redirect_uri=${encodeURIComponent(redirectUrl)}
-											&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect`
-						}
-					}
-				// #endif
-
-				uni.showLoading({
-					mask: true
-				})
-
-				if (type == 'univerify') {
-					let univerifyManager = uni.getUniverifyManager()
-					let clickAnotherButtons = false
-					let onButtonsClickFn = async res => {
-						console.log('点击了第三方登录，provider：', res, res.provider, this.univerifyStyle.buttons.list);
-						clickAnotherButtons = true
-						let checkBoxState = await uni.getCheckBoxState();
-						// 同步一键登录弹出层隐私协议框是否打勾
-						// #ifdef VUE2
-						this.agree = checkBoxState[1].state
-						// #endif
-						// #ifdef VUE3
-						this.agree = checkBoxState.state
-						// #endif
-						let {
-							path
-						} = this.univerifyStyle.buttons.list[res.index]
-						if (path) {
-							if( this.getRoute(1).includes('login-withoutpwd') && path.includes('login-withoutpwd') ){
-								this.getParentComponent().showCurrentWebview()
-							}
-							this.toPage(path,1)
-							closeUniverify()
-						} else {
-							if (this.agree) {
-								closeUniverify()
-								setTimeout(() => {
-									this.login_before(res.provider)
-								}, 500)
-							} else {
-								uni.showToast({
-									title: "你未同意隐私政策协议",
-									icon: 'none',
-									duration: 3000
-								});
-							}
-						}
-					}
-
-					function closeUniverify() {
-						uni.hideLoading()
-						univerifyManager.close()
-						// 取消订阅自定义按钮点击事件
-						univerifyManager.offButtonsClick(onButtonsClickFn)
-					}
-					// 订阅自定义按钮点击事件
-					univerifyManager.onButtonsClick(onButtonsClickFn)
-					// 调用一键登录弹框
-					return univerifyManager.login({
-						"univerifyStyle": this.univerifyStyle,
-						success: res => {
-							this.login(res.authResult, 'univerify')
-						},
-						fail(err) {
-							console.log(err)
-							if(!clickAnotherButtons){
-								uni.navigateBack()
-							}
-							// uni.showToast({
-							// 	title: JSON.stringify(err),
-							// 	icon: 'none',
-							// 	duration: 3000
-							// });
-						},
-						complete: async e => {
-							uni.hideLoading()
-							//同步一键登录弹出层隐私协议框是否打勾
-							// this.agree = (await uni.getCheckBoxState())[1].state
-							// 取消订阅自定义按钮点击事件
-							univerifyManager.offButtonsClick(onButtonsClickFn)
-						}
-					})
+											&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect`);
 				}
+			}
+			// #endif
 
-				if (type === 'weixinMobile') {
-					return this.login({
-						phoneCode: options.phoneNumberCode
-					}, type)
-				}
+			uni.showLoading({
+				mask: true
+			});
 
-				uni.login({
-					"provider": type,
-					"onlyAuthorize": true,
-					// #ifdef APP
-					"univerifyStyle": this.univerifyStyle,
+			if (type == 'univerify') {
+				let univerifyManager = uni.getUniverifyManager();
+				let clickAnotherButtons = false;
+				let onButtonsClickFn = async (res) => {
+					console.log('点击了第三方登录，provider：', res, res.provider, this.univerifyStyle.buttons.list);
+					clickAnotherButtons = true;
+					let checkBoxState = await uni.getCheckBoxState();
+					// 同步一键登录弹出层隐私协议框是否打勾
+					// #ifdef VUE2
+					this.agree = checkBoxState[1].state;
 					// #endif
-					success: async e => {
-						if (type == 'apple') {
-							let res = await this.getUserInfo({
-								provider: "apple"
-							})
-							Object.assign(e.authResult, res.userInfo)
-							uni.hideLoading()
+					// #ifdef VUE3
+					this.agree = checkBoxState.state;
+					// #endif
+					let { path } = this.univerifyStyle.buttons.list[res.index];
+					if (path) {
+						if (this.getRoute(1).includes('login-withoutpwd') && path.includes('login-withoutpwd')) {
+							this.getParentComponent().showCurrentWebview();
+						}
+						this.toPage(path, 1);
+						closeUniverify();
+					} else {
+						if (this.agree) {
+							closeUniverify();
+							setTimeout(() => {
+								this.login_before(res.provider);
+							}, 500);
+						} else {
+							uni.showToast({
+								title: '你未同意隐私政策协议',
+								icon: 'none',
+								duration: 3000
+							});
 						}
-						this.login(type == 'weixin' ? {
-							code: e.code
-						} : e.authResult, type)
-					},
-					fail: async (err) => {
-						console.log(err);
-						uni.hideLoading()
 					}
-				})
-			},
-			login(params, type) { //联网验证登录
-				// console.log('执行登录开始----');
-				console.log({params,type});
-				//toLowerCase
-				let action = 'loginBy' + type.trim().replace(type[0], type[0].toUpperCase())
-				const uniIdCo = uniCloud.importObject("uni-id-co",{
-					customUI:true
-				})
-				uniIdCo[action](params).then(result => {
+				};
+
+				function closeUniverify() {
+					uni.hideLoading();
+					univerifyManager.close();
+					// 取消订阅自定义按钮点击事件
+					univerifyManager.offButtonsClick(onButtonsClickFn);
+				}
+				// 订阅自定义按钮点击事件
+				univerifyManager.onButtonsClick(onButtonsClickFn);
+				// 调用一键登录弹框
+				return univerifyManager.login({
+					univerifyStyle: this.univerifyStyle,
+					success: (res) => {
+						this.login(res.authResult, 'univerify');
+					},
+					fail(err) {
+						console.log(err);
+						if (!clickAnotherButtons) {
+							uni.navigateBack();
+						}
+						// uni.showToast({
+						// 	title: JSON.stringify(err),
+						// 	icon: 'none',
+						// 	duration: 3000
+						// });
+					},
+					complete: async (e) => {
+						uni.hideLoading();
+						//同步一键登录弹出层隐私协议框是否打勾
+						// this.agree = (await uni.getCheckBoxState())[1].state
+						// 取消订阅自定义按钮点击事件
+						univerifyManager.offButtonsClick(onButtonsClickFn);
+					}
+				});
+			}
+
+			if (type === 'weixinMobile') {
+				return this.login(
+					{
+						phoneCode: options.phoneNumberCode
+					},
+					type
+				);
+			}
+
+			uni.login({
+				provider: type,
+				onlyAuthorize: true,
+				// #ifdef APP
+				univerifyStyle: this.univerifyStyle,
+				// #endif
+				success: async (e) => {
+					if (type == 'apple') {
+						let res = await this.getUserInfo({
+							provider: 'apple'
+						});
+						Object.assign(e.authResult, res.userInfo);
+						uni.hideLoading();
+					}
+					this.login(
+						type == 'weixin'
+							? {
+									code: e.code
+							  }
+							: e.authResult,
+						type
+					);
+				},
+				fail: async (err) => {
+					console.log(err);
+					uni.hideLoading();
+				}
+			});
+		},
+		login(params, type) {
+			//联网验证登录
+			// console.log('执行登录开始----');
+			console.log({ params, type });
+			//toLowerCase
+			let action = 'loginBy' + type.trim().replace(type[0], type[0].toUpperCase());
+			const uniIdCo = uniCloud.importObject('uni-id-co', {
+				customUI: true
+			});
+			uniIdCo[action](params)
+				.then((result) => {
 					uni.showToast({
 						title: '登录成功',
 						icon: 'none',
 						duration: 2000
 					});
 					// #ifdef H5
-					result.loginType = type
+					result.loginType = type;
 					// #endif
-					mutations.loginSuccess(result)
+					mutations.loginSuccess(result);
 				})
-				.catch(e=>{
+				.catch((e) => {
 					uni.showModal({
 						content: e.message,
-						confirmText:"知道了",
+						confirmText: '知道了',
 						showCancel: false
 					});
 				})
-				.finally(e => {
+				.finally((e) => {
 					if (type == 'univerify') {
-						uni.closeAuthView()
+						uni.closeAuthView();
 					}
-					uni.hideLoading()
-				})
-			},
-			async getUserInfo(e) {
-				return new Promise((resolve, reject) => {
-					uni.getUserInfo({
-						...e,
-						success: (res) => {
-							resolve(res);
-						},
-						fail: (err) => {
-							uni.showModal({
-								content: JSON.stringify(err),
-								showCancel: false
-							});
-							reject(err);
-						}
-					})
-				})
-			}
+					uni.hideLoading();
+				});
+		},
+		async getUserInfo(e) {
+			return new Promise((resolve, reject) => {
+				uni.getUserInfo({
+					...e,
+					success: (res) => {
+						resolve(res);
+					},
+					fail: (err) => {
+						uni.showModal({
+							content: JSON.stringify(err),
+							showCancel: false
+						});
+						reject(err);
+					}
+				});
+			});
 		}
 	}
+};
 </script>
 
 <style lang="scss">
-	/* #ifndef APP-NVUE */
-	.fab-login-box,
-	.item {
-		display: flex;
-		box-sizing: border-box;
-		flex-direction: column;
-	}
-	/* #endif */
+/* #ifndef APP-NVUE */
+.fab-login-box,
+.item {
+	display: flex;
+	box-sizing: border-box;
+	flex-direction: column;
+}
+/* #endif */
 
+.fab-login-box {
+	flex-direction: row;
+	flex-wrap: wrap;
+	width: 750rpx;
+	justify-content: space-around;
+	position: fixed;
+	left: 0;
+}
+
+.item {
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	height: 200rpx;
+	cursor: pointer;
+}
+
+/* #ifndef APP-NVUE */
+@media screen and (min-width: 690px) {
 	.fab-login-box {
-		flex-direction: row;
-		flex-wrap: wrap;
-		width: 750rpx;
-		justify-content: space-around;
-		position: fixed;
-		left: 0;
+		max-width: 500px;
+		margin-left: calc(50% - 250px);
 	}
-
 	.item {
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		height: 200rpx;
-		cursor: pointer;
+		height: 160rpx;
 	}
+}
 
-	/* #ifndef APP-NVUE */
-	@media screen and (min-width: 690px) {
-		.fab-login-box {
-			max-width: 500px;
-			margin-left: calc(50% - 250px);
-		}
-		.item {
-			height: 160rpx;
-		}
+@media screen and (max-width: 690px) {
+	.fab-login-box {
+		bottom: 10rpx;
 	}
+}
 
-	@media screen and (max-width: 690px) {
-		.fab-login-box {
-			bottom: 10rpx;
-		}
-	}
+/* #endif */
 
-	/* #endif */
+.logo {
+	width: 60rpx;
+	height: 60rpx;
+	max-width: 40px;
+	max-height: 40px;
+	border-radius: 100%;
+	border: solid 1px #f6f6f6;
+}
 
-	.logo {
-		width: 60rpx;
-		height: 60rpx;
-		max-width: 40px;
-		max-height: 40px;
-		border-radius: 100%;
-		border: solid 1px #F6F6F6;
-	}
-
-	.login-title {
-		text-align: center;
-		margin-top: 6px;
-		color: #999;
-		font-size: 10px;
-		width: 70px;
-	}
+.login-title {
+	text-align: center;
+	margin-top: 6px;
+	color: #999;
+	font-size: 10px;
+	width: 70px;
+}
 </style>
diff --git a/uni_modules/uni-id-pages/config.js b/uni_modules/uni-id-pages/config.js
index 618bcf7..f5ab36a 100644
--- a/uni_modules/uni-id-pages/config.js
+++ b/uni_modules/uni-id-pages/config.js
@@ -39,7 +39,7 @@ export default {
   appid: {
     weixin: {
       // 微信公众号的appid，来源:登录微信公众号（https://mp.weixin.qq.com）-> 设置与开发 -> 基本配置 -> 公众号开发信息 -> AppID
-      h5: 'xxxxxx',
+      h5: 'wx9f9b7d747d261686',
       // 微信开放平台的appid，来源:登录微信开放平台（https://open.weixin.qq.com） -> 管理中心 -> 网站应用 -> 选择对应的应用名称，点击查看 -> AppID
       web: 'xxxxxx'
     }
diff --git a/uni_modules/uts-openSchema/changelog.md b/uni_modules/uts-openSchema/changelog.md
deleted file mode 100644
index cb0bf4d..0000000
--- a/uni_modules/uts-openSchema/changelog.md
+++ /dev/null
@@ -1,2 +0,0 @@
-## 1.0.0（2024-04-25）
-- 更新 在 Android 和 iOS 上打开链接的 UTS API
diff --git a/uni_modules/uts-openSchema/package.json b/uni_modules/uts-openSchema/package.json
deleted file mode 100644
index 78c3ee3..0000000
--- a/uni_modules/uts-openSchema/package.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "id": "uts-openSchema",
-  "displayName": "uts-openSchema",
-  "version": "1.0.0",
-  "description": "在 Android 和 iOS 上打开链接的 UTS API",
-  "keywords": [
-    "uts-openSchema"
-],
-  "repository": "",
-  "engines": {
-    "HBuilderX": "^4.0"
-  },
-  "dcloudext": {
-    "type": "uts",
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": ""
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y",
-        "alipay": "y"
-      },
-      "client": {
-        "Vue": {
-          "vue2": "n",
-          "vue3": "y"
-        },
-        "App": {
-          "app-android": "y",
-          "app-ios": "y"
-        },
-        "H5-mobile": {
-          "Safari": "n",
-          "Android Browser": "n",
-          "微信浏览器(Android)": "n",
-          "QQ浏览器(Android)": "n"
-        },
-        "H5-pc": {
-          "Chrome": "n",
-          "IE": "n",
-          "Edge": "n",
-          "Firefox": "n",
-          "Safari": "n"
-        },
-        "小程序": {
-          "微信": "n",
-          "阿里": "n",
-          "百度": "n",
-          "字节跳动": "n",
-          "QQ": "n",
-          "钉钉": "n",
-          "快手": "n",
-          "飞书": "n",
-          "京东": "n"
-        },
-        "快应用": {
-          "华为": "n",
-          "联盟": "n"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/uni_modules/uts-openSchema/readme.md b/uni_modules/uts-openSchema/readme.md
deleted file mode 100644
index 7bda602..0000000
--- a/uni_modules/uts-openSchema/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# uts-openSchema
-### 开发文档
-[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
-[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
-[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
-[Hello UTS](https://gitcode.net/dcloud/hello-uts)
\ No newline at end of file
diff --git a/uni_modules/uts-openSchema/utssdk/app-android/config.json b/uni_modules/uts-openSchema/utssdk/app-android/config.json
deleted file mode 100644
index bf95925..0000000
--- a/uni_modules/uts-openSchema/utssdk/app-android/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "minSdkVersion": "21"
-}
\ No newline at end of file
diff --git a/uni_modules/uts-openSchema/utssdk/app-android/index.uts b/uni_modules/uts-openSchema/utssdk/app-android/index.uts
deleted file mode 100644
index 660c99e..0000000
--- a/uni_modules/uts-openSchema/utssdk/app-android/index.uts
+++ /dev/null
@@ -1,15 +0,0 @@
-import Intent from 'android.content.Intent'
-import Uri from 'android.net.Uri'
-import { OpenSchema } from '../interface.uts'
-
-export const openSchema: OpenSchema = function (url: string) {
-  if (typeof url === 'string' && url.length > 0) {
-    const context = UTSAndroid.getUniActivity()!
-    const uri = Uri.parse(url)
-    const intent = new Intent(Intent.ACTION_VIEW, uri)
-    intent.setData(uri)
-    context.startActivity(intent)
-  } else {
-    console.error('url param ERROR：', JSON.stringify(url))
-  }
-}
diff --git a/uni_modules/uts-openSchema/utssdk/app-ios/config.json b/uni_modules/uts-openSchema/utssdk/app-ios/config.json
deleted file mode 100644
index f272043..0000000
--- a/uni_modules/uts-openSchema/utssdk/app-ios/config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "deploymentTarget": "12.0"
-}
\ No newline at end of file
diff --git a/uni_modules/uts-openSchema/utssdk/app-ios/index.uts b/uni_modules/uts-openSchema/utssdk/app-ios/index.uts
deleted file mode 100644
index 6483e4f..0000000
--- a/uni_modules/uts-openSchema/utssdk/app-ios/index.uts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { OpenSchema } from '../interface.uts'
-
-export const openSchema: OpenSchema = function(url: string): void {
-	if (typeof url == 'string' && url.length > 0) {
-		let uri = new URL(string = url)
-		if (uri != null && UIApplication.shared.canOpenURL(uri!)) {
-			UIApplication.shared.open(uri!, options = new Map<UIApplication.OpenExternalURLOptionsKey, any>(), completionHandler = null)
-		}else {
-			console.error('url param Error: ', url)
-		}
-	}else {
-		console.error('url param Error: ', url)
-	}
-}
\ No newline at end of file
diff --git a/uni_modules/uts-openSchema/utssdk/interface.uts b/uni_modules/uts-openSchema/utssdk/interface.uts
deleted file mode 100644
index e790e61..0000000
--- a/uni_modules/uts-openSchema/utssdk/interface.uts
+++ /dev/null
@@ -1 +0,0 @@
-export type OpenSchema = (url: string) => void