diff --git a/App.vue b/App.vue
index 57ad092..28f3b1c 100644
--- a/App.vue
+++ b/App.vue
@@ -1,9 +1,13 @@
 
 
 <script>
+	import { initEid } from './mp_ecard_sdk/main'
 	export default {
 		onLaunch: function() {
 			console.log('App Launch')
+			// #ifdef MP-WEIXIN
+			initEid();
+			// #endif
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/components/privacyRadion/privacyRadion.vue b/components/privacyRadion/privacyRadion.vue
index 1df393a..6ee0a74 100644
--- a/components/privacyRadion/privacyRadion.vue
+++ b/components/privacyRadion/privacyRadion.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="radioWrap">
 		<u-checkbox-group >
-			<u-checkbox  :checked="isCheck" shape="circle" label="已阅读并同意" :labelSize="12"  @change="changeRadio">已阅读并同意</u-checkbox>
+			<u-checkbox  :checked="isCheck" shape="circle" label="已阅读并同意"  activeColor="#DE3A26" :labelSize="12"  @change="changeRadio">已阅读并同意</u-checkbox>
 		</u-checkbox-group>
 		<view class="privacyText">
 			<text @click="goPage(2)">《用户协议》</text>和 <text @click="goPage(1)">《隐私协议》</text>
diff --git a/config/api.js b/config/api.js
index 6299ab2..a34f718 100644
--- a/config/api.js
+++ b/config/api.js
@@ -32,6 +32,12 @@ export const logOut = (data={}) => http.post('member/auth/logout', data, {custom
  export const houseRoom = (data) => http.post('house/room_search', data)
  // 绑定房子
  export const houseRoomBind = (data) => http.post('house/bind_room', data)
+ // 实名认证区取token
+ export const getFacetoken = (data) => http.post('face/get_token', data)
+ // 获取认证结果
+ export const getFaceResult = (data) => http.post('face/get_result', data)
+ 
+ 
  
  
  
diff --git a/config/request.js b/config/request.js
index 6cb7c95..4b29e63 100644
--- a/config/request.js
+++ b/config/request.js
@@ -1,8 +1,12 @@
 
 import setObj from '@/config/site.config.js';
 let { H5_API, WX_API,httpPrefix } = setObj
-// import { H5_API, WX_API,httpPrefix } from '@/config/site.config.js';
-// import { refreshToken } from './utils'
+import { useUserStoreHook } from '@/store/index.js';
+// console.log('不能用？')
+// console.log(useUserStoreHook())
+
+const counterStore = useUserStoreHook();
+
 import md5 from 'js-md5'
 let secretKey = '22d90e09d1374f0f9e4accd07d333e55'
 
@@ -33,8 +37,8 @@ let secretKey = '22d90e09d1374f0f9e4accd07d333e55'
 		let hash = md5(strSecretKey)
 		config.header['Signature'] = hash
 		config.data = jsonString
-		// let token = vm.$store.state.user.vuex_loginInfo.accessToken
-		let token = ''
+		
+		let token = counterStore.token
 		if(token) {
 			config.header.Authorization = 'Bearer ' + token
 		}
@@ -67,7 +71,8 @@ let secretKey = '22d90e09d1374f0f9e4accd07d333e55'
 		if(data.code==401) {
 			console.log('报401的接口')
 			console.log(response.config.url)
-			return	uni.$u.debounce(vm.$store.commit('goLogin'), 1500)
+			return
+			// return	uni.$u.debounce(vm.$store.commit('goLogin'), 1500)
 		}
 		
 		// 自定义参数
diff --git a/config/site.config.js b/config/site.config.js
index 9843267..967a0c6 100644
--- a/config/site.config.js
+++ b/config/site.config.js
@@ -1,11 +1,13 @@
 const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM || 'h5';
+
+
 // localIp = false
 let obj = {
   H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理
   WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://192.168.1.106:8518/',//非代理地址 不要忘记加/
   website: 'http://192.168.1.37',
   httpPrefix: 'app-api/',
-  imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/',
+  imgUrl: 'http://47.96.82.242/htmls/',
   // 支付测试地址
   // preUrl: 'https://u8wbs.zyebank.cn/cem_ysb_u6/index.html',
   // const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html'
diff --git a/manifest.json b/manifest.json
index 6191cc5..1f47c75 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,11 +50,14 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wxb9f5233e39665f59",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "es6" : false,
+            "minified" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "permission" : {}
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -69,17 +72,17 @@
         "enable" : false
     },
     "vueVersion" : "3",
-	"h5" : {
-	    // "router" : {
-	    //     "mode" : "hash",
-	    //     "base" : "/h5"
-	    // },
-	    "sdkConfigs" : {
-	        "maps" : {
-	            "qqmap" : {
-	                "key" : "NRWBZ-TKRWV-CSAPH-5PFDS-J4HT6-IWF4O"
-	            }
-	        }
-	    }
-	}
+    "h5" : {
+        // "router" : {
+        //     "mode" : "hash",
+        //     "base" : "/h5"
+        // },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "NRWBZ-TKRWV-CSAPH-5PFDS-J4HT6-IWF4O"
+                }
+            }
+        }
+    }
 }
diff --git a/mp_ecard_sdk/constants/log.js b/mp_ecard_sdk/constants/log.js
new file mode 100644
index 0000000..10fa747
--- /dev/null
+++ b/mp_ecard_sdk/constants/log.js
@@ -0,0 +1 @@
+const Log={version:"uni_1.0.5__stable",SourceType:"mp_sdk_uni",getIntoIndexPage:"START_INDEX",initSdk:"INIT_SDK",getConfig:"GET_CONFIG",getConfigRetry:"GET_CONFIG_BY_RETRY",webViewResult:"WEBVIEW_RESULT",webViewError:"WEBVIEW_ERROR",navigateToEid:"NAVIGATE_TO_EID",navigateBackFromEid:"NAVIGATE_BACK_FROM_EID",navigateBackFromEidFail:"NAVIGATE_BACK_FROM_EID_FAIL",startEid:"START_EID",startEidFail:"START_EID_FAIL",eidVerifyDone:"EID_VERIFY_DONE",requestFail:"REQUEST_FAIL",requestCatch:"REQUEST_CATCH",onAppShow:"ON_APP_SHOW"};export default Log;
\ No newline at end of file
diff --git a/mp_ecard_sdk/globalConfig.js b/mp_ecard_sdk/globalConfig.js
new file mode 100644
index 0000000..7845571
--- /dev/null
+++ b/mp_ecard_sdk/globalConfig.js
@@ -0,0 +1 @@
+export default{normalPath:""};
\ No newline at end of file
diff --git a/mp_ecard_sdk/index.css b/mp_ecard_sdk/index.css
new file mode 100644
index 0000000..9a87b80
--- /dev/null
+++ b/mp_ecard_sdk/index.css
@@ -0,0 +1 @@
+.auth{margin-top:128rpx;display:flex;flex-direction:column;align-items:center}.auth-logo{width:200rpx;height:200rpx}.auth-logo image{height:100%;width:100%}.title{margin-top:20rpx;font-size:36rpx;line-height:56rpx}.merchant-name{display:inline;font-weight:700}.sub-title{margin-top:8rpx;font-size:34rpx;line-height:52rpx}.button-area{margin-top:48rpx}.button-area button{width:622rpx;height:96rpx;background:#fff;border:2rpx solid #ddd;font-size:32rpx;font-weight:400;line-height:96rpx;padding:0}.redirect{margin-top:272rpx;display:flex;flex-direction:column;align-items:center}.loading{height:160rpx;width:160rpx;margin-bottom:32rpx}.loading image{height:100%;width:100%}.title{font-size:34rpx;line-height:52rpx}
\ No newline at end of file
diff --git a/mp_ecard_sdk/index/index.js b/mp_ecard_sdk/index/index.js
new file mode 100644
index 0000000..82d802f
--- /dev/null
+++ b/mp_ecard_sdk/index/index.js
@@ -0,0 +1 @@
+import Log from"../constants/log.js";import{navigateToEid,reportStat}from"../utils/index";export default{data(){return{token:""}},onLoad(t){var{token:t,needJumpPage:e}=t;this.token=t,uni.reportLogToEid({token:t,event:Log.getIntoIndexPage,errMsg:`进入配置首页,token:${t},needJumpPage:`+e}),reportStat({module:"StartIndex",action:"enter"})},onUnload(){reportStat({module:"StartIndex",action:"leave"})},methods:{handleStart(){navigateToEid(this.token)}}};
\ No newline at end of file
diff --git a/mp_ecard_sdk/index/index.vue b/mp_ecard_sdk/index/index.vue
new file mode 100644
index 0000000..323a333
--- /dev/null
+++ b/mp_ecard_sdk/index/index.vue
@@ -0,0 +1,24 @@
+<template>
+	<view class="auth">
+		<view class="auth-logo">
+			<image src="https://faceid-h5-1254418846.file.myqcloud.com/mp_verify_sdk/images/ecard/logo.png" />
+		</view>
+		<view class="title">
+			即将进入"eID数字身份"小程序
+		</view>
+		<view class="button-area">
+			<button @click='handleStart' >
+				确认进入
+			</button>
+		</view>
+	</view>
+</template>
+
+<script>
+import index from "./index";
+export default index;
+</script>
+
+<style>
+@import url('../index.css');
+</style>
diff --git a/mp_ecard_sdk/main.js b/mp_ecard_sdk/main.js
new file mode 100644
index 0000000..ec9d4fb
--- /dev/null
+++ b/mp_ecard_sdk/main.js
@@ -0,0 +1 @@
+import validate from"./utils/validate";import Log from"./constants/log";import globalConfig from"./globalConfig";import{navigateToEid,reportStat}from"./utils/index";const EIDAppID="wx0e2cb0b052a91c92";function initEid(e="https://eid.faceid.qq.com",o="release",n="https://eid-enhance.faceid.qq.com"){uni.eidBaseUrl=e,uni.eidEnvVersion=o,uni.eidBackUpUrl=n;uni.onAppShow(e=>{console.log("!!!!!!监听onshow事件",e,uni.eidTokenToCallback);var{scene:e,referrerInfo:o}=e,{appId:o,extraData:n}=o||{},{token:i,verifyDone:t}=n||{};1038===e&&o===EIDAppID&&n&&(t&&uni.handleEidVerifyDone?uni.eidTokenToCallback&&uni.eidTokenToCallback===i&&(uni.eidTokenToCallback="",uni.reportLogToEid({token:i,event:Log.navigateBackFromEid,errMsg:`从EID核身完成返回，token:${i},verifyDone:`+t}),console.log("!!!!!!执行回调"),uni.handleEidVerifyDone(n)):uni.reportLogToEid({token:i,event:Log.navigateBackFromEidFail,errMsg:`核验未完成或者没有处理核验完成的函数，token:${i},verifyDone:`+t}))});e=uni.getSystemInfoSync();const d=e["version"];uni.reportLogToEid=function(e){var{token:e="",event:o="",errCode:n="",errMsg:i="",data:t={}}=e,r=new Date;const a={Token:e,SourceType:Log.SourceType,SourceVersion:Log.version,EnvVersion:d,Timestamp:r.getTime(),Event:o,ErrorCode:"number"==typeof n?n.toString():n,ErrorMsg:i,Data:JSON.stringify(t)};console.log("开始上报日志：",a),uni.request({url:uni.eidBaseUrl+"/api/common/ReportEvent",method:"POST",data:a,success(e){console.log("上报日志完成：","payload:",a,"res:",e)}})}}function startEid(e){const{data:o,verifyDoneCallback:n}=e;if(!o||!n)return uni.reportLogToEid({token:i,event:Log.startEidFail,errMsg:"传入的参数有误"}),void uni.showModal({title:"提示",content:"传入的参数有误",showCancel:!1});const{token:i,needJumpPage:t=!1,enableEmbedded:r=!1,allowFullScreen:a=!0}=o;validate.isValidateToken(i)?(uni.enableEmbedded=r,uni.allowFullScreen=a,uni.VerifyEid_TOKEN=i,reportStat({module:"EidStart",action:"enter"}),uni.handleEidVerifyDone=e=>{const o=e["token"];reportStat({module:"EidEnd",action:"leave"}),t?uni.navigateBack({success(){uni.reportLogToEid({token:o,event:Log.EidVerifyDone,errMsg:"验证完成，token："+o}),n({token:o,verifyDone:!0})}}):(uni.reportLogToEid({token:o,event:Log.EidVerifyDone,errMsg:"验证完成，token："+o}),n({token:o,verifyDone:!0}))},t?uni.navigateTo({url:`${globalConfig.normalPath}/mp_ecard_sdk/index/index?token=${i}&needJumpPage=`+t}):navigateToEid(i)):(uni.reportLogToEid({token:i,event:Log.startEidFail,errMsg:"传入的token有误，token:"+i}),uni.showModal({title:"提示",content:"传入的token有误",showCancel:!1}))}export{initEid,startEid};
\ No newline at end of file
diff --git a/mp_ecard_sdk/utils/http.js b/mp_ecard_sdk/utils/http.js
new file mode 100644
index 0000000..8cb4831
--- /dev/null
+++ b/mp_ecard_sdk/utils/http.js
@@ -0,0 +1 @@
+import Log from"../constants/log.js";const request=function(e,t){const{token:o="",url:a,method:r="POST",data:s,reTry:d,header:u={"Content-Type":"application/json"}}=e;try{uni.request({url:uni.eidBaseUrl+a,method:r,data:s,header:u,success(r){console.log("request success:",r),200===r.statusCode&&r.data?0==r.data.ErrorCode||0==r.data.code?t({ErrorCode:0,ErrorMsg:r.data.ErrorMsg,Data:r.data.Data||r.data.data,reTry:d}):t({ErrorCode:r.data.ErrorCode,ErrorMsg:r.data.ErrorMsg,Data:r.data.Data||r.data.data}):t({ErrorCode:-101,ErrorMsg:"请求错误，请稍后重试"})},fail(r){console.log("request error:",r),d&&d.tryCount&&0<d.tryCount?(d.tryCount--,uni.eidBaseUrl=uni.eidBackUpUrl,setTimeout(()=>{request(e,t)},d.retryDelay||0)):t({ErrorCode:-107,ErrorMsg:"request请求异常，请稍后重试"}),uni.reportLogToEid({token:o,event:Log.requestFail,errCode:"-1",errMsg:"requestFail 调用失败",data:{url:""+(uni.eidBaseUrl+a),err:r}})}})}catch(r){console.log("request error:",r),t({ErrorCode:-109,ErrorMsg:"request方法异常，请稍后重试"}),uni.reportLogToEid({token:o,event:Log.requestCatch,errCode:"-1",errMsg:"requestFail 调用失败",data:{url:""+(uni.eidBaseUrl+a),err:r}})}},$http=request;export{$http};
\ No newline at end of file
diff --git a/mp_ecard_sdk/utils/index.js b/mp_ecard_sdk/utils/index.js
new file mode 100644
index 0000000..14b8c23
--- /dev/null
+++ b/mp_ecard_sdk/utils/index.js
@@ -0,0 +1 @@
+import Log from"../constants/log";const navigateToEid=o=>{console.log("navigateToEid",uni.eidEnvVersion),reportStat({module:"showNavigateToEidDialog",action:"enter"}),(uni.enableEmbedded&&uni.openEmbeddedMiniProgram?uni.openEmbeddedMiniProgram:uni.navigateToMiniProgram)({appId:"wx0e2cb0b052a91c92",path:"pages/huiyan/index",envVersion:uni.eidEnvVersion,allowFullScreen:uni.allowFullScreen,extraData:{useHuiyan:!0,huiyanToken:o},success(e){console.log("success",e),uni.eidTokenToCallback=o,reportStat({module:"NavigateToEid",action:"confirm"}),reportStat({module:"showNavigateToEidDialog",action:"leave"})},fail(e){console.log("err",e),reportStat({module:"NavigateToEid",action:"cancel"})},complete(e){reportStat({module:"NavigateToEidDailog",action:"leave"}),uni.reportLogToEid({token:o,event:Log.navigateToEid,errMsg:e.errMsg})}})},reportStat=async({token:e=uni.VerifyEid_TOKEN,module:a,action:n})=>{if(console.log("reportStat",a,n),e)return console.log("上报埋点：",a,n),new Promise((o,i)=>{uni.request({url:uni.eidBaseUrl+"/api/report/EidEvents?token="+e,method:"POST",data:{token:e,eidSDKVersion:Log.version,enableEmbedded:uni.enableEmbedded,dataList:[{startTimestamp:Date.now(),module:a,action:n}]},success(e){o(e)},fail(e){i(e)}})})};export{navigateToEid,reportStat};
\ No newline at end of file
diff --git a/mp_ecard_sdk/utils/validate.js b/mp_ecard_sdk/utils/validate.js
new file mode 100644
index 0000000..99f0b1d
--- /dev/null
+++ b/mp_ecard_sdk/utils/validate.js
@@ -0,0 +1 @@
+function isValidateToken(e){return/^[a-zA-Z0-9-]{36}$/.test(e)}export default{isValidateToken:isValidateToken};
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 71e4273..5433410 100644
--- a/pages.json
+++ b/pages.json
@@ -13,85 +13,107 @@
 				"navigationBarTitleText": "我的",
 				"navigationStyle": "custom"
 			}
-		}
-	],
-	"subPackages": [
+		},
+
 		{
-			"root": "pages/subPage",
-			"pages": [
-				{
-					"path": "notice/notice",
-					"style": {
-						"navigationBarTitleText": "公示公告",
-						"enablePullDownRefresh": false,
-						"backgroundTextStyle": "dark" 
-					}
-				},
-				{
-					"path": "login/login",
-					"style": {
-						"navigationBarTitleText": "登录",
-						"enablePullDownRefresh": false,
-						"backgroundTextStyle": "dark" 
-					}
-				},
-				{
-					"path": "login/loginwx",
-					"style": {
-						"navigationBarTitleText": "登录",
-						"enablePullDownRefresh": false,
-						"backgroundTextStyle": "dark" 
-					}
-				},
-				{
-					"path": "authentication/authentication",
-					"style": {
-						"navigationBarTitleText": "业主认证",
-						"enablePullDownRefresh": false,
-						"backgroundTextStyle": "dark" 
-					}
-				},
-				{
-					"path": "authentication/comp/select1",
-					"style": {
-						"navigationBarTitleText": "业主认证",
-						"enablePullDownRefresh": false,
-						"backgroundTextStyle": "dark" 
-					}
-				},
-				{
-					"path": "authentication/comp/select2",
-					"style": {
-						"navigationBarTitleText": "业主认证",
-						"enablePullDownRefresh": false,
-						"backgroundTextStyle": "dark" 
-					}
-				},
-				{
-					"path": "authentication/comp/select3",
-					"style": {
-						"navigationBarTitleText": "业主认证",
-						"enablePullDownRefresh": false,
-						"backgroundTextStyle": "dark" 
-					}
-				},
-				{
-					"path": "privacyAgreement/privacyAgreement",
-					"style": {
-						"navigationBarTitleText": "业主认证",
-						"enablePullDownRefresh": false,
-						"backgroundTextStyle": "dark" 
-					}
-				}
-				
-				
-			]
+			"path": "mp_ecard_sdk/index/index",
+			"style": {
+				"navigationBarTitleText": "腾讯云E证通授权"
+			}
 		}
+
 	],
+	"subPackages": [{
+		"root": "pages/subPage",
+		"pages": [{
+				"path": "notice/notice",
+				"style": {
+					"navigationBarTitleText": "公示公告",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "dark"
+				}
+			},
+			{
+				"path": "login/login",
+				"style": {
+					"navigationBarTitleText": "登录",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "dark"
+				}
+			},
+			// {
+			// 	"path": "login/loginwx",
+			// 	"style": {
+			// 		"navigationBarTitleText": "登录",
+			// 		"enablePullDownRefresh": false,
+			// 		"backgroundTextStyle": "dark" 
+			// 	}
+			// },
+			{
+				"path": "authentication/authentication",
+				"style": {
+					"navigationBarTitleText": "业主认证",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "dark"
+				}
+			},
+			{
+				"path": "authentication/comp/select1",
+				"style": {
+					"navigationBarTitleText": "业主认证",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "dark"
+				}
+			},
+			{
+				"path": "authentication/comp/select2",
+				"style": {
+					"navigationBarTitleText": "业主认证",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "dark"
+				}
+			},
+			{
+				"path": "authentication/comp/select3",
+				"style": {
+					"navigationBarTitleText": "业主认证",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "dark"
+				}
+			},
+			{
+				"path": "privacyAgreement/privacyAgreement",
+				"style": {
+					"navigationBarTitleText": "用户协议",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "dark"
+				}
+			},
+			{
+				"path": "ballots/ballotsList/ballotsList",
+				"style": {
+					"navigationBarTitleText": "投票表决",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "dark"
+				}
+			},
+			{
+				"path": "ballots/vote/vote",
+				"style": {
+					"navigationBarTitleText": "投票表决",
+					"enablePullDownRefresh": false,
+					"backgroundTextStyle": "dark"
+				}
+			}
+			
+
+
+		]
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
@@ -114,12 +136,12 @@
 	},
 	"uniIdRouter": {},
 	"easycom": {
-			"autoscan": true,
-			// 注意一定要放在custom里，否则无效，https://ask.dcloud.net.cn/question/131175
-			"custom": {
-				"^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
-				"^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
-		    "^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue"
-			}
+		"autoscan": true,
+		// 注意一定要放在custom里，否则无效，https://ask.dcloud.net.cn/question/131175
+		"custom": {
+			"^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
+			"^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
+			"^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue"
 		}
-}
+	}
+}
\ No newline at end of file
diff --git a/pages/subPage/authentication/authentication.vue b/pages/subPage/authentication/authentication.vue
index 6066ec9..07efcda 100644
--- a/pages/subPage/authentication/authentication.vue
+++ b/pages/subPage/authentication/authentication.vue
@@ -4,7 +4,7 @@
 			<view class="steps flex-b">
 				<view class="proress" :style="{width: proressWith}"></view>
 				<view class="step">
-					<view class="num active" >01<view class="text">房屋信息</view></view>
+					<view class="num active" >01<view class="text">房屋信息1</view></view>
 				</view>
 				<view class="step">
 					<view class="num"  :class="{active: currentStep}">02<view class="text">个人资料</view></view>
@@ -17,48 +17,152 @@
 		
 		<view class="line"></view>
 		
-		<view class="padding">
-			<view class="step1">
+		<view class="padding" >
+			<view class="step1" v-if="currentStep==0">
 				<view class="h1">请选择您的房屋地址</view>
 				<view class="lab">房屋信息</view>
 				<view class="row flex-b">
 					<view class="lable">详细地址</view>
 					<view class="flex" @click="$goPage('/pages/subPage/authentication/comp/select1')">
-						<view class="adrs">请选择</view>
+						<view class="adrs" v-if="counterStore.chooseHouse.houseId">{{ houseStr }}</view>
+						<view class="adrs" v-else>请选择</view>
 						<u-icon name="arrow-right" color="#CCCCCC"></u-icon>
 					</view>
 				</view>
 				<view class="btnBox">
-					<oneBtn text="下一步" :disabled="true"></oneBtn>
+					<oneBtn text="下一步" :disabled="!counterStore.chooseHouse.houseId" @oneBtnClick="nextStep(1)"></oneBtn>
 				</view>
 			</view>
+			
+			<view class="step2"  v-if="currentStep==1">
+				<view class="btnBox">
+					<oneBtn text="点击开始实名认证"  @oneBtnClick="nextStep(2)"></oneBtn>
+				</view>
+			</view>
+			
+			<view class="step3"  v-if="currentStep==2">
+				<view class="okIcon">
+					<image src="@/static/images/okIcon.png" mode=""></image>
+				</view>
+				<view class="oktext">认证成功</view>
+				<view class="btnBox">
+					<oneBtn text="返回首页"  @oneBtnClick="nextStep(3)"></oneBtn>
+				</view>
+			</view>
+			
 		</view>
 	</view>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				currentStep: 1
-			}
-		},
-		computed: {
-			proressWith() {
-				if(this.currentStep==0) {
-					return 0
-				}else if(this.currentStep==1) {
-					return '290rpx'
-				}else {
-					return '100%'
-				}
+<script setup>
+	import { startEid } from '@/mp_ecard_sdk/main';
+	
+	import { getFacetoken, getFaceResult, houseRoomBind } from '@/config/api.js'
+	
+	import {userStore} from '@/store/index.js';
+	const counterStore = userStore();
+	
+	import { ref, computed } from 'vue'
+	const currentStep = ref(0)
+	
+	const proressWith = computed(() => { 
+		if(currentStep.value==1) return '290rpx'
+		if(currentStep.value==2) return '100%'
+		return 0
+	})
+	
+	const houseStr = computed(() => {
+		let item = counterStore.chooseHouse
+		if(!item.houseId) return ''
+		let str = item.communityName +' - '+ item.houseTypeName +' - '+ item.roomNum
+		return str
+	})
+	
+	function nextStep(num) {
+		// 第一步如果没有选择房子是不能走第二步的
+		if(num==0&&!counterStore.chooseHouse.houseId) return
+		if(num==1) currentStep.value = num
+		if(num==2) {
+			getpersonfaceFn()
+		}
+		if(num==3) {
+			counterStore.chooseHouse = {
+				"roomNum": "",
+				  "houseType": '',
+				  "houseTypeName": '',
+				  "communityId": '',
+				  "communityName": '',
+				  "userName": 0,
+				  "idNo": "",
+				  "houseId": '',
 			}
+			uni.switchTab({
+				url: '/pages/tabbar/index/index'
+			})
 		}
 	}
+	async function getpersonfaceFn() {
+		// {MerchantId: '0NSJ2407181630565100'}
+		// let obj = {
+			
+		// }
+		const {data: res} = await getFacetoken()
+		console.log('获取到token了,很好')
+		console.log(res)
+		console.log(res.eidToken)
+		goSDK(res.eidToken)
+	}
+	async function GetDetectInfoEnhancedFn(EidToken) {
+		// userId: counterStore.loginInfo.userId, InfoType: 1
+		const {data: res} = await getFaceResult({token: EidToken,  })
+		console.log('返回的结果信息')
+		console.log(res)
+		
+		counterStore.upDateHouse('idNo', res.idCard)
+		counterStore.upDateHouse('userName', res.name)
+		counterStore.upDateUseInfo('idCard', res.idCard)
+		counterStore.upDateUseInfo('name', res.name)
+		houseRoomBindFn()
+		
+	}
+	
+	// 绑定房子
+	async function houseRoomBindFn() {
+		const {data: res} = await houseRoomBind(counterStore.chooseHouse)
+		console.log(res)
+		currentStep.value = 2
+		uni.hideLoading()
+	}
+	 // 示例方法
+	 function goSDK(token) {
+			        startEid({
+			            data: {
+			                token,
+			            },
+			            verifyDoneCallback(res) {  
+			                const { token, verifyDone } = res;
+			                console.log('收到核身完成的res:', res);
+			                console.log('核身的token是:', token); 
+							uni.showLoading({
+								title: '正在加载，请稍后……'
+							})
+							GetDetectInfoEnhancedFn(token)
+			                console.log('是否完成核身:', verifyDone);          
+			            },
+			        });
+			    }
 </script>
 
 <style lang="scss" scoped>
+	image {
+		display: block;
+		width: 100%;
+		height: 100%;
+	}
 	.content {
+		.btnBox {
+			margin-top: 60rpx;
+		}
 		.line {
 			width: 100%;
 			height: 20rpx;
@@ -79,8 +183,25 @@
 					margin-right: 6rpx;
 				}
 			}
+			
+		}
+		.step3 {
+			padding: 40rpx 0;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			.okIcon {
+				width: 303rpx;
+				height: 164rpx;
+			}
+			.oktext {
+				font-size: 36rpx;
+				color: #343434;
+				margin-top: 20rpx;
+			}
 			.btnBox {
-				margin-top: 60rpx;
+				width: 100%;
 			}
 		}
 		.stepTop {
diff --git a/pages/subPage/authentication/comp/select1.vue b/pages/subPage/authentication/comp/select1.vue
index 1350243..d08c522 100644
--- a/pages/subPage/authentication/comp/select1.vue
+++ b/pages/subPage/authentication/comp/select1.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content padding">
 		<view class="tit">选择小区</view>
-		<view class="searchBox">
+		<!-- <view class="searchBox">
 			<searchRow placeholder="请输入小区名称"/>
 		</view>
 		<view class="poz flex-b">
@@ -12,30 +12,45 @@
 				</view>
 				<view class="city">杭州市</view>
 			</view>
-		</view>
+		</view> -->
 		
-		<view class="huicity">杭州市</view>
+		<!-- <view class="huicity">杭州市</view> -->
 		
 		<view class="ul">
-			<view class="li" v-for="(item,index) in 3" :key="index" @click="chooseItem(item)">小区名称</view>
+			<view class="li" v-for="(item,index) in houseList" :key="index" @click="chooseItem(item)">{{ item.communityName }}</view>
 		</view>
 		
 	</view>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			chooseItem(item) {
-				this.$goPage('/pages/subPage/authentication/comp/select2')
-			}
-		}
+<script setup>
+	import { houseTree } from '@/config/api.js'
+	import { ref } from 'vue'
+	import {userStore} from '@/store/index.js';
+	const counterStore = userStore();
+	
+	let houseList = ref([])
+	
+	async function houseTreeFn() {
+		console.log('没有请求吗、')
+		const {data: res} = await houseTree()
+		res.forEach(item=>{
+			houseList.value.push(item.root)
+		})
+		console.log(res)
+		console.log(houseList.value)
 	}
+	
+	function chooseItem(item) {
+		counterStore.upDateHouse('communityId', item.communityId)
+		counterStore.upDateHouse('communityName', item.communityName)
+		
+		uni.navigateTo({
+			url: '/pages/subPage/authentication/comp/select2'
+		})
+	}
+	
+	houseTreeFn()
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/subPage/authentication/comp/select2.vue b/pages/subPage/authentication/comp/select2.vue
index bee114e..3dcb720 100644
--- a/pages/subPage/authentication/comp/select2.vue
+++ b/pages/subPage/authentication/comp/select2.vue
@@ -1,32 +1,47 @@
 <template>
 	<view class="content padding">
 		<view class="tit">选择房屋类型</view>
-		<view class="searchBox">
+		<!-- <view class="searchBox">
 			<searchRow placeholder="请输入房屋类型"/>
-		</view>
+		</view> -->
 		
 		<view class="ul">
-			<view class="li" v-for="(item,index) in 3" :key="index" @click="chooseItem(item)">一期住宅</view>
+			<view class="li" v-for="(item,index) in houseList" :key="index" @click="chooseItem(item)">{{ item.houseTypeName }}</view>
 		</view>
 		
 	</view>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			chooseItem(item) {
-				this.$goPage('/pages/subPage/authentication/comp/select3')
-			}
-		}
+
+
+<script setup>
+	import { houseTree } from '@/config/api.js'
+	import { ref } from 'vue'
+	import {userStore} from '@/store/index.js';
+	const counterStore = userStore();
+	
+	let houseList = ref([])
+	
+	async function houseTreeFn() {
+		console.log('没有请求吗、')
+		const {data: res} = await houseTree()
+		houseList.value = res[0].houseTypeNode
+		console.log(res)
+		console.log(houseList.value)
 	}
+	
+	function chooseItem(item) {
+		counterStore.upDateHouse('houseType', item.houseTypeId)
+		counterStore.upDateHouse('houseTypeName', item.houseTypeName)
+		uni.navigateTo({
+			url: '/pages/subPage/authentication/comp/select3'
+		})
+	}
+	
+	houseTreeFn()
 </script>
 
+
 <style lang="scss" scoped>
 	image {
 		display: block;
diff --git a/pages/subPage/authentication/comp/select3.vue b/pages/subPage/authentication/comp/select3.vue
index 3f86fda..6306108 100644
--- a/pages/subPage/authentication/comp/select3.vue
+++ b/pages/subPage/authentication/comp/select3.vue
@@ -2,31 +2,53 @@
 	<view class="content padding">
 		<view class="tit">选择房屋房号</view>
 		<view class="searchBox">
-			<searchRow placeholder="请输入您的房号"/>
+			<searchRow placeholder="请输入您的房号" @searchFn="searchFn"/>
 		</view>
 		
 		<view class="ul">
-			<view class="li" v-for="(item,index) in 3" :key="index" @click="chooseItem(item)">1-1-101</view>
+			<view class="li" v-for="(item,index) in houseList" :key="index" @click="chooseItem(item)">{{ item.roomNumDesc }}</view>
 		</view>
 		
 	</view>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			chooseItem(item) {
-				this.$goPage('/pages/subPage/authentication/authentication')
-			}
+
+<script setup>
+	import { houseRoom } from '@/config/api.js'
+	import { ref } from 'vue'
+	import {userStore} from '@/store/index.js';
+	const counterStore = userStore();
+	
+	let houseList = ref([])
+	
+	async function houseTreeFn(roomNum='') {
+		let obj = {
+			"roomNum": roomNum,
+		  "houseType": counterStore.chooseHouse.houseType,
+		  "communityId": counterStore.chooseHouse.communityId
 		}
+		const {data: res} = await houseRoom(obj)
+		if(!res) return houseList.value = []
+		houseList.value = res
+		console.log(res)
+		console.log(houseList.value)
+	}
+	
+	function chooseItem(item) {
+		counterStore.upDateHouse('roomNum', item.roomNumDesc)
+		counterStore.upDateHouse('houseId', item.houseId)
+		uni.navigateTo({
+			url: '/pages/subPage/authentication/authentication'
+		})
+	}
+	
+	function searchFn(val) {
+		houseTreeFn(val)
 	}
+	houseTreeFn()
 </script>
 
+
 <style lang="scss" scoped>
 	image {
 		display: block;
diff --git a/pages/subPage/ballots/ballotsList/ballotsList.vue b/pages/subPage/ballots/ballotsList/ballotsList.vue
new file mode 100644
index 0000000..873fd85
--- /dev/null
+++ b/pages/subPage/ballots/ballotsList/ballotsList.vue
@@ -0,0 +1,151 @@
+<template>
+	<view class="content padding">
+		<view class="banner">
+			<image src="@/static/images/homebanner.png" mode=""></image>
+		</view>
+		
+		<view class="tabs">
+			<up-tabs :list="tabArr" @click="tabClick" lineColor="#DE3A26"> </up-tabs>
+		</view>
+		
+		<view class="tags">
+			<view class="tag"  v-for="(item,index) in tagArr" :key="index" :class="{active: currentTag==item.id}" @click="tagClick(item)">{{ item.name }}</view>
+		</view>
+		
+		<view class="ul">
+			<view class="li">
+				<view class="flex-b">
+					<view class="name towRowText">说要两行显示说要两行显示说要两行显示说要两行显示说要两行显示说要两行显示说要两行显示</view>
+					<view class="btn" @click="goVote(item)">我要投票</view>
+				</view>
+				<view class="text">
+					<text>发起人：张三</text>
+					<text>截止时间：2024-04-01  19:30</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script  setup>
+	
+	import { reactive, ref } from 'vue';  
+	  
+	const tabArr = reactive([  
+	    { name: '投票列表', id: 1 },  
+	    { name: '我的投票', id: 2 },
+	]);  
+	const tagArr = reactive([
+	    { name: '全部', id: 1 },  
+	    { name: '进行中', id: 2 },
+	    { name: '已结束', id: 3 },
+	]);
+	// tab切换
+	function tabClick(item) {  
+	    console.log('item', item);  
+	}
+	// 类型筛选
+	let currentTag = ref(1)
+	function tagClick(item) {
+		currentTag.value = item.id
+	}
+	
+	function goVote(item) {
+		console.log(item)
+		uni.navigateTo({
+			url: '/pages/subPage/ballots/vote/vote'
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	image {
+		display: block;
+		width: 100%;
+		height: 100%;
+	}
+	
+	.content {
+	  .banner {
+	    width: 100%;
+		height: 174rpx;
+	  }
+	
+	  .tabs {
+	    padding: 30rpx 0 10rpx 0;
+		border-bottom: 1px solid #EFEFEF;
+	  }
+	
+	  .tags {
+		  width: 100%;
+		  height: 110rpx;
+		  display: flex;
+		  align-items: center;
+		  border-bottom: 1px solid #EFEFEF;
+	    .tag {
+			height: 50rpx;
+			background: #EFEFEF;
+			border-radius: 25rpx;
+			border: 1px solid #F4F4F4;
+			line-height: 50rpx;
+			padding: 0 14rpx;
+			font-size: 24rpx;
+			margin-right: 30rpx;
+			&.active {
+				color: $themC;
+				background: rgba(222,58,38,0.1);
+				border-radius: 25rpx;
+				border: 1px solid #DE3A26;
+			}
+	    }
+	  }
+	
+	  .ul {
+		  width: 100%;
+	    .li {
+			width: 100%;
+			padding: 30rpx 0;
+			border-bottom: 1px solid #EFEFEF;
+			&:last-child {
+				border: none;
+			}
+	      .flex-b {
+	        .name {
+				font-size: 32rpx;
+				color: #333333;
+				flex: 1;
+				width: 0;
+				padding-right: 30rpx;
+	        }
+	
+	        .btn {
+				width: 132rpx;
+				height: 44rpx;
+				background: #DE3A26;
+				border-radius: 22rpx;
+				font-size: 24rpx;
+				color: #fff;
+				text-align: center;
+				line-height: 44rpx;
+				&.boder {
+					border: 1px solid #DE3A26;
+					color: $themC;
+				}
+				&.hui {
+					opacity: 0.4;
+				}
+	        }
+	      }
+	
+	      .text {
+			  padding-top: 14rpx;
+	        text {
+				font-size: 24rpx;
+				color: #9C9C9C;
+				margin-right: 40rpx;
+	        }
+	      }
+	    }
+	  }
+	}
+</style>
\ No newline at end of file
diff --git a/pages/subPage/ballots/vote/vote.vue b/pages/subPage/ballots/vote/vote.vue
new file mode 100644
index 0000000..bbd5812
--- /dev/null
+++ b/pages/subPage/ballots/vote/vote.vue
@@ -0,0 +1,11 @@
+<template>
+	<view class="content">
+		66
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/subPage/login/login - 副本.vue b/pages/subPage/login/login - 副本.vue
new file mode 100644
index 0000000..870b086
--- /dev/null
+++ b/pages/subPage/login/login - 副本.vue	
@@ -0,0 +1,194 @@
+<template>
+	<view class="content">
+		<view class="padding">
+			<view class="logoCon">
+				<view class="logo">
+					<image src="@/static/images/logo.png" mode=""></image>
+				</view>
+				<view class="name">事务通</view>
+			</view>
+
+			<view class="oneBtnBox" v-if="!isCheck">
+				<oneBtn text="微信一键登录" @oneBtnClick="handleBtnClick"></oneBtn>
+			</view>
+			<view class="oneBtnBox" v-else>
+				<!-- <button open-type="getPhoneNumber"  @getphonenumber="getPhoneNumber" class="cotactzz">联系客服</button> -->
+				<oneBtn text="微信一键登录"></oneBtn>
+			</view>
+			
+			<view style="padding-top: 30rpx;">
+				<privacyRadion style="margin-top: 40rpx;"  @changeRadio="changeRadio" :isCheck="isCheck"/>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { weixinLogin } from '@/config/api.js'
+	// import { toast} from '@/uni_modules/uview-plus'
+	// import {userStore} from '@/store/index.js
+	export default {
+		data() {
+			return {
+				FormData: {
+					phone: '',
+					code: ''
+				},
+				isCheck: false
+			}
+		},
+		methods: {
+			handleBtnClick() {
+				this.$u.toast('请先勾先勾选用户协议与隐私政策')
+			},
+			// 是否选择协议
+			changeRadio(val) {
+				 uni.hideKeyboard();
+				this.isCheck = val
+			},
+			async getPhoneNumber (e) {
+				if(!this.isCheck) return this.$u.toast('请勾选产品协议与隐私政策');
+				let phoneCode = e.detail.code
+				console.log('来到这里了吗？')
+				console.log(phoneCode)
+			    console.log(e.detail.errMsg) // 回调信息（成功失败都会返回）
+			    console.log(e.detail)  // 错误码（失败时返回）
+				const loginCode = await this.loginFn()
+				if(!loginCode||!phoneCode) return
+				console.log('登录验证码')
+				console.log(loginCode)
+				let obj = {
+					phoneCode,
+					socialCode: loginCode
+				}
+				const {data: res} = await weixinLogin(obj)
+				console.log(res)
+				console.log('什么都没有？')
+				console.log(userStore())
+				const counterStore = userStore();
+				console.log('什么都没有？')
+				console.log(counterStore)
+				console.log(counterStore.upDateLoginInfo)
+				counterStore.upDateLoginInfo(res)
+				counterStore.upDateToken(res.accessToken)
+				// this.$goPage('/pages/userCenter/login/face')
+				uni.switchTab({
+					url: '/pages/tabbar/index/index'
+				})
+			  },
+			
+			loginFn() {
+			      // 微信登录
+				  return new Promise((resolve,reject)=>{
+					  uni.login({
+					    provider: 'weixin',
+					    success: loginRes => {
+					      if (loginRes.code) {
+					        // 登录成功，获取用户信息
+					  						console.log('loginRes.code')
+					  						console.log(loginRes.code)
+											resolve(loginRes.code)
+					        // this.getUserInfo(loginRes.code);
+					      } else {
+					        console.error('微信登录失败');
+					      }
+					    },
+					    fail: err => {
+							reject(null)
+					      console.error('微信登录失败', err);
+					    }
+					  });
+				  })
+			      
+			    },
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	image {
+		display: block;
+		width: 100%;
+		height: 100%;
+	}
+
+.other {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	font-size: 22rpx;
+	color: #9C9C9C;
+	position: fixed;
+	bottom: 80rpx;
+	left: 0;
+	width: 100%;
+  .lineTxt {
+	  position: relative;
+	  
+	&::before {
+		content: '';
+		position: absolute;
+		width: 240rpx;
+		height: 1rpx;
+		top: 50%;
+		background: #e6e6e6;
+		right: 150rpx;
+		transform: translateY(50%);
+		z-index: 99;
+	}
+	&::after {
+		content: '';
+		position: absolute;
+		width: 240rpx;
+		height: 1rpx;
+		top: 50%;
+		background: #e6e6e6;
+		left: 150rpx;
+		transform: translateY(50%);
+		z-index: 99;
+	}
+  }
+
+  .icon {
+	  width: 80rpx;
+	  height: 80rpx;
+	  margin: 20rpx 0;
+  }
+
+  .txt {
+	
+  }
+}
+
+	.content {
+		.logoCon {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			padding-top: 150rpx;
+			.logo {
+				width: 160rpx;
+				height: 160rpx;
+			}
+
+			.name {
+				font-size: 32rpx;
+				margin-top: 20rpx;
+				font-weight: 700;
+			}
+		}
+		.oneBtnBox {
+			margin-top: 40rpx;
+			position: relative;
+			.cotactzz {
+				position: absolute;
+				left: 0;
+				right: 0;
+				top: 0;
+				opacity: 0;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/subPage/login/login.vue b/pages/subPage/login/login.vue
index 99b3ea9..2fe1dc1 100644
--- a/pages/subPage/login/login.vue
+++ b/pages/subPage/login/login.vue
@@ -12,87 +12,101 @@
 				<oneBtn text="微信一键登录" @oneBtnClick="handleBtnClick"></oneBtn>
 			</view>
 			<view class="oneBtnBox" v-else>
-				<button type="default" open-type="getPhoneNumber"  @getphonenumber="getPhoneNumber" class="cotact">联系客服</button>
-				<oneBtn text="微信一键登录"></oneBtn>
+				<button open-type="getPhoneNumber"  @getphonenumber="getPhoneNumber" class="cotactzz">微信一键登录</button>
+				<oneBtn text="微信一键登录0"></oneBtn>
 			</view>
-			
+
 			<view style="padding-top: 30rpx;">
-				<privacyRadion style="margin-top: 40rpx;"  @changeRadio="changeRadio" :isCheck="isCheck"/>
+				<privacyRadion style="margin-top: 40rpx;" @changeRadio="changeRadio" :isCheck="isCheck" />
 			</view>
 		</view>
 	</view>
 </template>
 
-<script>
-	import { weixinLogin } from '@/config/api.js'
-	import { toast} from '@/uni_modules/uview-plus'
-	export default {
-		data() {
-			return {
-				FormData: {
-					phone: '',
-					code: ''
+<script setup>
+	import { ref } from 'vue'
+	import {
+		weixinLogin
+	} from '@/config/api.js'
+	import {
+		toast
+	} from '@/uni_modules/uview-plus'
+	import {
+		userStore
+	} from '@/store/index.js';
+	import privacyRadion from '@/components/privacyRadion/privacyRadion.vue'
+	let FormData = ref({
+		phone: '',
+		code: ''
+	})
+	let isCheck = ref(false)
+
+	function handleBtnClick() {
+		toast('请先勾先勾选用户协议与隐私政策')
+	}
+	// 是否选择协议
+	 function changeRadio(val) {
+			uni.hideKeyboard();
+			isCheck.value = val
+		}
+	
+
+	function loginFn() {
+		// 微信登录
+		return new Promise((resolve, reject) => {
+			uni.login({
+				provider: 'weixin',
+				success: loginRes => {
+					if (loginRes.code) {
+						// 登录成功，获取用户信息
+						console.log('loginRes.code')
+						console.log(loginRes.code)
+						resolve(loginRes.code)
+						// this.getUserInfo(loginRes.code);
+					} else {
+						console.error('微信登录失败');
+					}
 				},
-				isCheck: false
-			}
-		},
-		methods: {
-			handleBtnClick() {
-				this.$u.toast('请先勾先勾选用户协议与隐私政策')
-			},
-			// 是否选择协议
-			changeRadio(val) {
-				 uni.hideKeyboard();
-				this.isCheck = val
-			},
-			async getPhoneNumber (e) {
-				if(!this.isCheck) return this.$u.toast('请勾选产品协议与隐私政策');
-				let phoneCode = e.detail.code
-				console.log('来到这里了吗？')
-				console.log(phoneCode)
-			    console.log(e.detail.errMsg) // 回调信息（成功失败都会返回）
-			    console.log(e.detail)  // 错误码（失败时返回）
-				const loginCode = await this.loginFn()
-				if(!loginCode||!phoneCode) return
-				console.log('登录验证码')
-				console.log(loginCode)
-				let obj = {
-					phoneCode,
-					socialCode: loginCode
+				fail: err => {
+					reject(null)
+					console.error('微信登录失败', err);
 				}
-				const {data: res} = await weixinLogin(obj)
-				console.log(res)
-				// this.$goPage('/pages/userCenter/login/face')
-				// uni.switchTab({
-				// 	url: '/pages/tabbar/index/index'
-				// })
-			  },
-			
-			loginFn() {
-			      // 微信登录
-				  return new Promise((resolve,reject)=>{
-					  uni.login({
-					    provider: 'weixin',
-					    success: loginRes => {
-					      if (loginRes.code) {
-					        // 登录成功，获取用户信息
-					  						console.log('loginRes.code')
-					  						console.log(loginRes.code)
-											resolve(loginRes.code)
-					        // this.getUserInfo(loginRes.code);
-					      } else {
-					        console.error('微信登录失败');
-					      }
-					    },
-					    fail: err => {
-							reject(null)
-					      console.error('微信登录失败', err);
-					    }
-					  });
-				  })
-			      
-			    },
+			});
+		})
+
+	}
+	
+	async function getPhoneNumber(e) {
+		if (!isCheck.value) return toast('请勾选产品协议与隐私政策');
+		let phoneCode = e.detail.code
+		console.log('来到这里了吗？')
+		console.log(phoneCode)
+		console.log(e.detail.errMsg) // 回调信息（成功失败都会返回）
+		console.log(e.detail) // 错误码（失败时返回）
+		const loginCode = await loginFn()
+		if (!loginCode || !phoneCode) return
+		console.log('登录验证码')
+		console.log(loginCode)
+		let obj = {
+			phoneCode,
+			socialCode: loginCode
 		}
+		const {
+			data: res
+		} = await weixinLogin(obj)
+		console.log(res)
+		// console.log('什么都没有？')
+		// console.log(userStore())
+		const counterStore = userStore();
+		console.log('什么都没有？')
+		console.log(counterStore)
+		console.log(counterStore.upDateLoginInfo)
+		counterStore.upDateLoginInfo(res)
+		counterStore.upDateToken(res.accessToken)
+		// this.$goPage('/pages/userCenter/login/face')
+		uni.switchTab({
+			url: '/pages/tabbar/index/index'
+		})
 	}
 </script>
 
@@ -103,54 +117,54 @@
 		height: 100%;
 	}
 
-.other {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	font-size: 22rpx;
-	color: #9C9C9C;
-	position: fixed;
-	bottom: 80rpx;
-	left: 0;
-	width: 100%;
-  .lineTxt {
-	  position: relative;
-	  
-	&::before {
-		content: '';
-		position: absolute;
-		width: 240rpx;
-		height: 1rpx;
-		top: 50%;
-		background: #e6e6e6;
-		right: 150rpx;
-		transform: translateY(50%);
-		z-index: 99;
-	}
-	&::after {
-		content: '';
-		position: absolute;
-		width: 240rpx;
-		height: 1rpx;
-		top: 50%;
-		background: #e6e6e6;
-		left: 150rpx;
-		transform: translateY(50%);
-		z-index: 99;
-	}
-  }
+	.other {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: 22rpx;
+		color: #9C9C9C;
+		position: fixed;
+		bottom: 80rpx;
+		left: 0;
+		width: 100%;
+
+		.lineTxt {
+			position: relative;
 
-  .icon {
-	  width: 80rpx;
-	  height: 80rpx;
-	  margin: 20rpx 0;
-  }
+			&::before {
+				content: '';
+				position: absolute;
+				width: 240rpx;
+				height: 1rpx;
+				top: 50%;
+				background: #e6e6e6;
+				right: 150rpx;
+				transform: translateY(50%);
+				z-index: 99;
+			}
 
-  .txt {
-	
-  }
-}
+			&::after {
+				content: '';
+				position: absolute;
+				width: 240rpx;
+				height: 1rpx;
+				top: 50%;
+				background: #e6e6e6;
+				left: 150rpx;
+				transform: translateY(50%);
+				z-index: 99;
+			}
+		}
+
+		.icon {
+			width: 80rpx;
+			height: 80rpx;
+			margin: 20rpx 0;
+		}
+
+		.txt {}
+	}
 
 	.content {
 		.logoCon {
@@ -159,6 +173,7 @@
 			align-items: center;
 			justify-content: center;
 			padding-top: 150rpx;
+
 			.logo {
 				width: 160rpx;
 				height: 160rpx;
@@ -170,10 +185,12 @@
 				font-weight: 700;
 			}
 		}
+
 		.oneBtnBox {
 			margin-top: 40rpx;
 			position: relative;
-			.cotact {
+
+			.cotactzz {
 				position: absolute;
 				left: 0;
 				right: 0;
diff --git a/pages/subPage/login/loginwx.vue b/pages/subPage/login/loginwx.vue
index 8933170..73e1692 100644
--- a/pages/subPage/login/loginwx.vue
+++ b/pages/subPage/login/loginwx.vue
@@ -25,6 +25,7 @@
 <script>
 	import { weixinLogin } from '@/config/api.js'
 	import { toast} from '@/uni_modules/uview-plus'
+	import {userStore} from '@/store/index.js
 	export default {
 		data() {
 			return {
@@ -60,11 +61,13 @@
 					socialCode: loginCode
 				}
 				const {data: res} = await weixinLogin(obj)
-				console.log(res)
+				const counterStore = userStore();
+				counterStore.upDateLoginInfo(res)
+				counterStore.upDateToken(res.accessToken)
 				// this.$goPage('/pages/userCenter/login/face')
-				// uni.switchTab({
-				// 	url: '/pages/tabbar/index/index'
-				// })
+				uni.switchTab({
+					url: '/pages/tabbar/index/index'
+				})
 			  },
 			
 			loginFn() {
diff --git a/pages/tabbar/index/comp/notice.vue b/pages/tabbar/index/comp/notice.vue
index 4024b3b..1a9e033 100644
--- a/pages/tabbar/index/comp/notice.vue
+++ b/pages/tabbar/index/comp/notice.vue
@@ -1,20 +1,23 @@
 <template>
 	<view class="ul">
-		<view class="li flex-b" v-for="(item,index) in 6" :key="index">
+		<view class="li flex-b" v-for="(item,index) in list" :key="index">
 			<view class="leftTxt">
 				<view class="tit towRowText">
-					公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题
+					{{ item.title }}
 				</view>
 				<view class="date">2024.06.28  18:42</view>
 			</view>
 			<view class="cover">
-				<image src="@/static/images/homebanner3.png" mode=""></image>
+				<image :src="item.picture" mode=""></image>
 			</view>
 		</view>
 	</view>
 </template>
 
-<script>
+<script >
+	export default {
+		props: ['list']
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 1cc4195..f9dbdf0 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -7,38 +7,44 @@
 		</up-navbar>
 		<view class="padding">
 			<view class="banner1">
-				<image src="@/static/images/homebanner.png" mode=""></image>
+				<image :src="imgUrl + 'homebanner.png'" mode=""></image>
 			</view>
 			<view class="myhome">
 				<view class="flex-b">
 					<view class="h2">我的房屋</view>
 					<view class="btn" @click="goHome">关联房屋</view>
 				</view>
-				<!-- <view class="borderCard">
-					<view class="text">房屋地址：新疆首府公馆一期住宅1-1-101</view>
-					<view class="text">房屋面积：156.32㎡</view>
-					<view class="banner3">
-						<image src="@/static/images/homebanner3.png" mode=""></image>
-					</view>
-				</view> -->
-				<view class="borderCard" @click="$goPage('/pages/subPage/login/login')">
+				
+				<view class="borderCard" @click="$goPage('/pages/subPage/login/login')" v-if="!counterStore.token">
 					<view class="flex">
 						<view class="text2">立即登录</view>
 						<u-icon name="arrow-right"></u-icon>
 					</view>
 					<view class="text3">登录成功即可关联房屋~</view>
 					<view class="banner3">
-						<image src="@/static/images/homebanner3.png" mode=""></image>
+						<image :src="imgUrl + 'homebanner3.png'" mode=""></image>
+						<!-- <image src="@/static/images/homebanner3.png" mode=""></image> -->
 					</view>
 				</view>
+				
+				<view class="borderCard"  v-if="counterStore.token">
+					<view class="text">房屋地址：新疆首府公馆一期住宅1-1-101</view>
+					<view class="text">房屋面积：156.32㎡</view>
+					<view class="banner3">
+						<!-- <image src="@/static/images/homebanner3.png" mode=""></image> -->
+						<image :src="imgUrl + 'homebanner3.png'" mode=""></image>
+					</view>
+				</view>
+				
 			</view>
 
 			<view class="severCon">
 				<view class="h1pad">
 					<view class="h1">服务</view>
 				</view>
-				<view class="banner2">
-					<image src="@/static/images/homebanner2.png" mode=""></image>
+				<view class="banner2" @click="$goPage('/pages/subPage/ballots/ballotsList/ballotsList')">
+					<!-- <image src="@/static/images/homebanner2.png" mode=""></image> -->
+					<image :src="imgUrl + 'homebanner2.png'" mode=""></image>
 				</view>
 			</view>
 
@@ -52,7 +58,7 @@
 						</view>
 					</view>
 				</view>
-				<notice />
+				<notice :list="noticeList"/>
 			</view>
 		</view>
 		<up-popup :show="show" @close="show=false" mode="center" :round="10" :customStyle="{width: '90%'}" closeable>
@@ -68,6 +74,9 @@
 </template>
 
 <script setup>
+	import siteObj from '@/config/site.config.js'
+	const {imgUrl} = siteObj
+	
 	import {
 		ref
 	} from 'vue'
@@ -77,10 +86,17 @@
 	} from '@/store/index.js';
 	import { getNoticeList } from '@/config/api.js'
 	
+	import {
+			onLoad,
+			onShow,
+			onPullDownRefresh,
+			onReachBottom
+		} from '@dcloudio/uni-app'
+	
 
 	const counterStore = userStore();
-	console.log(counterStore.count)
-	const show = ref(true)
+	console.log(counterStore.token)
+	const show = ref(false)
 
 	function authentication() {
 		show.value = false
@@ -96,12 +112,12 @@
 	let noticeList = ref([])
 	async function getNoticeListFn() {
 		const {data: res} = await getNoticeList(params)
-		console.log(res)
+		noticeList.value = res.list
 	}
 	getNoticeListFn()
 	
 	function goHome() {
-		let token = uni.getStorageSync('token') || '';
+		let token = counterStore.token;
 		if(token) {
 			uni.$u.route({
 				url: '/pages/subPage/authentication/authentication'
@@ -113,6 +129,9 @@
 		}
 	}
 	
+	onPullDownRefresh(()=>{
+		getNoticeListFn()
+	})
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/tabbar/mine/mine.vue b/pages/tabbar/mine/mine.vue
index ea160ee..86b9f93 100644
--- a/pages/tabbar/mine/mine.vue
+++ b/pages/tabbar/mine/mine.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view class="content" :style="{background:'url('+topBgUrl+') #F5F5F5 no-repeat', backgroundSize: '100% 552rpx' }">
 		<view class="padding">
 			<view class="userInfo flex" @click="$goPage('/pages/subPage/login/login')">
 				<view class="avatar">
@@ -24,17 +24,18 @@
 	</view>
 </template>
 
-<script >
- export default {
-	 data() {
-		 return {
-			 configList: [
-				 {text: '用户协议', url: '/pages/subPage/privacyAgreement/privacyAgreement?type=1'},
-				 {text: '隐私政策', url: '/pages/subPage/privacyAgreement/privacyAgreement?type=2'},
-			 ]
-		 }
-	 }
- }
+<script setup>
+import siteObj from '@/config/site.config.js'
+const {imgUrl} = siteObj
+const topBgUrl = imgUrl + 'minebg.png'
+console.log('topBgUrl')
+console.log(topBgUrl)
+import { ref } from 'vue'
+const configList = ref([
+	{text: '用户协议', url: '/pages/subPage/privacyAgreement/privacyAgreement?type=1'},
+	{text: '隐私政策', url: '/pages/subPage/privacyAgreement/privacyAgreement?type=2'},
+])
+
 </script>
 
 <style lang="scss" scoped>
@@ -45,8 +46,8 @@
 	}
 	.content {
 		width: 100%;
-		background: url('../../../static/images/minebg.png') #F5F5F5 no-repeat;
-		background-size: 100% 552rpx;
+		// background: url('http://47.96.82.242/htmls/bigImg/minebg.png') #F5F5F5 no-repeat;
+		
 		min-height: 100vh;
 		
 	  .userInfo {
diff --git a/static/images/bigImg/homebanner.png b/static/images/bigImg/homebanner.png
new file mode 100644
index 0000000..c3cb375
Binary files /dev/null and b/static/images/bigImg/homebanner.png differ
diff --git a/static/images/bigImg/homebanner2.png b/static/images/bigImg/homebanner2.png
new file mode 100644
index 0000000..4be30e5
Binary files /dev/null and b/static/images/bigImg/homebanner2.png differ
diff --git a/static/images/bigImg/homebanner3.png b/static/images/bigImg/homebanner3.png
new file mode 100644
index 0000000..faf7577
Binary files /dev/null and b/static/images/bigImg/homebanner3.png differ
diff --git a/static/images/bigImg/minebg.png b/static/images/bigImg/minebg.png
new file mode 100644
index 0000000..416dc08
Binary files /dev/null and b/static/images/bigImg/minebg.png differ
diff --git a/static/images/okIcon.png b/static/images/okIcon.png
new file mode 100644
index 0000000..0eea25a
Binary files /dev/null and b/static/images/okIcon.png differ
diff --git a/store/index.js b/store/index.js
index 899e3a9..d3cfcf6 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,14 +1,50 @@
 // stores/counterStore.js
-import { defineStore } from 'pinia';
+import { defineStore, createPinia } from 'pinia';
+const store = createPinia();
+
  
 export const userStore = defineStore({
   id: 'userStore',
   state: () => ({
-    token: 10,
+    token: uni.getStorageSync('token')?uni.getStorageSync('token'):'2f58eb3901ec4396a33cc015b9b1c28c',
+	loginInfo: uni.getStorageSync('loginInfo')?uni.getStorageSync('loginInfo'):{},
+	userInfo: {
+		idCard: '',
+		name: ''
+	},
+	chooseHouse: {
+		"roomNum": "",
+		  "houseType": '',
+		  "houseTypeName": '',
+		  "communityId": '',
+		  "communityName": '',
+		  "userName": 0,
+		  "idNo": "用户身份证号",
+		  "houseId": '',
+	  }
+	  
   }),
   actions: {
-    increment(token) {
+    upDateToken(token) {
       this.token = token
+	  uni.setStorageSync('token', token)
     },
+	upDateLoginInfo(info) {
+		console.log('没来这里么？')
+		this.loginInfo = info
+		uni.setStorageSync('loginInfo', info)
+	},
+	upDateHouse(key, value) {
+		this.chooseHouse[key] = value
+		console.log(this.chooseHouse)
+	},
+	upDateUseInfo(key, value) {
+		this.userInfo[key] = value
+		console.log(this.userInfo)
+	}
   },
-});
\ No newline at end of file
+});
+
+export function useUserStoreHook() {
+  return userStore(store);
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 5ee69da..4e8a0bd 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common_vendor = require("./common/vendor.js");
+const mp_ecard_sdk_main = require("./mp_ecard_sdk/main.js");
 const uni_modules_uviewPlus_index = require("./uni_modules/uview-plus/index.js");
 const config_request = require("./config/request.js");
 const utils_utils = require("./utils/utils.js");
+require("./mp_ecard_sdk/utils/validate.js");
+require("./mp_ecard_sdk/constants/log.js");
+require("./mp_ecard_sdk/globalConfig.js");
+require("./mp_ecard_sdk/utils/index.js");
 require("./uni_modules/uview-plus/libs/mixin/mixin.js");
 require("./uni_modules/uview-plus/libs/vue.js");
 require("./uni_modules/uview-plus/libs/function/index.js");
@@ -121,20 +126,25 @@ require("./uni_modules/uview-plus/libs/config/props/upload.js");
 require("./uni_modules/uview-plus/libs/config/zIndex.js");
 require("./uni_modules/uview-plus/libs/function/platform.js");
 require("./config/site.config.js");
+require("./store/index.js");
 if (!Math) {
   "./pages/tabbar/index/index.js";
   "./pages/tabbar/mine/mine.js";
+  "./mp_ecard_sdk/index/index.js";
   "./pages/subPage/notice/notice.js";
   "./pages/subPage/login/login.js";
-  "./pages/subPage/login/loginwx.js";
   "./pages/subPage/authentication/authentication.js";
   "./pages/subPage/authentication/comp/select1.js";
   "./pages/subPage/authentication/comp/select2.js";
   "./pages/subPage/authentication/comp/select3.js";
+  "./pages/subPage/privacyAgreement/privacyAgreement.js";
+  "./pages/subPage/ballots/ballotsList/ballotsList.js";
+  "./pages/subPage/ballots/vote/vote.js";
 }
 const _sfc_main = {
   onLaunch: function() {
     console.log("App Launch");
+    mp_ecard_sdk_main.initEid();
   },
   onShow: function() {
     console.log("App Show");
@@ -150,7 +160,7 @@ function createApp() {
   const pinia = common_vendor.createPinia();
   app.use(pinia);
   app.use(uni_modules_uviewPlus_index.uviewPlus);
-  config_request.request(app);
+  config_request.request();
   return {
     app
   };
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 5f3ba90..47d315a 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -1,7 +1,8 @@
 {
   "pages": [
     "pages/tabbar/index/index",
-    "pages/tabbar/mine/mine"
+    "pages/tabbar/mine/mine",
+    "mp_ecard_sdk/index/index"
   ],
   "subPackages": [
     {
@@ -9,18 +10,20 @@
       "pages": [
         "notice/notice",
         "login/login",
-        "login/loginwx",
         "authentication/authentication",
         "authentication/comp/select1",
         "authentication/comp/select2",
-        "authentication/comp/select3"
+        "authentication/comp/select3",
+        "privacyAgreement/privacyAgreement",
+        "ballots/ballotsList/ballotsList",
+        "ballots/vote/vote"
       ]
     }
   ],
   "window": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
+    "navigationBarBackgroundColor": "#ffffff",
     "backgroundColor": "#F8F8F8"
   },
   "tabBar": {
@@ -42,5 +45,6 @@
       }
     ]
   },
+  "permission": {},
   "usingComponents": {}
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index a6db2cd..54a16b6 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -1,15 +1,11 @@
 "use strict";
-const _imports_0$4 = "/static/images/homebanner.png";
-const _imports_0$3 = "/static/images/homebanner3.png";
-const _imports_2 = "/static/images/homebanner2.png";
-const _imports_3 = "/static/images/arrRight.png";
-const _imports_0$2 = "/static/images/logo.png";
-const _imports_0$1 = "/static/images/pozicon.png";
+const _imports_0$4 = "/static/images/arrRight.png";
+const _imports_0$3 = "/static/images/logo.png";
+const _imports_0$2 = "/static/images/okIcon.png";
+const _imports_0$1 = "/static/images/homebanner.png";
 const _imports_0 = "/static/images/searchIcon.png";
 exports._imports_0 = _imports_0$4;
 exports._imports_0$1 = _imports_0$3;
 exports._imports_0$2 = _imports_0$2;
 exports._imports_0$3 = _imports_0$1;
 exports._imports_0$4 = _imports_0;
-exports._imports_2 = _imports_2;
-exports._imports_3 = _imports_3;
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index d5a606a..23b7341 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -83,7 +83,7 @@ const replacer = (_key, val) => {
     return {
       [`Set(${val.size})`]: [...val.values()]
     };
-  } else if (isObject(val) && !isArray(val) && !isPlainObject(val)) {
+  } else if (isObject(val) && !isArray(val) && !isPlainObject$1(val)) {
     return String(val);
   }
   return val;
@@ -120,7 +120,7 @@ const toTypeString = (value) => objectToString.call(value);
 const toRawType = (value) => {
   return toTypeString(value).slice(8, -1);
 };
-const isPlainObject = (val) => toTypeString(val) === "[object Object]";
+const isPlainObject$1 = (val) => toTypeString(val) === "[object Object]";
 const isIntegerKey = (key) => isString(key) && key !== "NaN" && key[0] !== "-" && "" + parseInt(key, 10) === key;
 const isReservedProp = /* @__PURE__ */ makeMap(
   // the leading comma is intentional so empty string "" is also included
@@ -231,7 +231,7 @@ function getValueByDataPath(obj, path) {
 }
 function sortObject(obj) {
   let sortObj = {};
-  if (isPlainObject(obj)) {
+  if (isPlainObject$1(obj)) {
     Object.keys(obj).sort().forEach((key) => {
       const _key = key;
       sortObj[_key] = obj[_key];
@@ -245,7 +245,7 @@ function stringifyQuery(obj, encodeStr = encode) {
     let val = obj[key];
     if (typeof val === void 0 || val === null) {
       val = "";
-    } else if (isPlainObject(val)) {
+    } else if (isPlainObject$1(val)) {
       val = JSON.stringify(val);
     }
     return encodeStr(key) + "=" + encodeStr(val);
@@ -460,7 +460,7 @@ function validateProtocols(name, args, protocol, onFail) {
   }
 }
 function validateProp$1(name, value, prop, isAbsent) {
-  if (!isPlainObject(prop)) {
+  if (!isPlainObject$1(prop)) {
     prop = { type: prop };
   }
   const { type, required, validator } = prop;
@@ -598,7 +598,7 @@ function normalizeErrMsg$1(errMsg, name) {
   return name + errMsg.substring(errMsg.indexOf(":fail"));
 }
 function createAsyncApiCallback(name, args = {}, { beforeAll, beforeSuccess } = {}) {
-  if (!isPlainObject(args)) {
+  if (!isPlainObject$1(args)) {
     args = {};
   }
   const { success, fail, complete } = getApiCallbacks(args);
@@ -720,7 +720,7 @@ function invokeApi(method, api, options, params) {
   return api(options, ...params);
 }
 function hasCallback(args) {
-  if (isPlainObject(args) && [API_SUCCESS, API_FAIL, API_COMPLETE].find((cb) => isFunction(args[cb]))) {
+  if (isPlainObject$1(args) && [API_SUCCESS, API_FAIL, API_COMPLETE].find((cb) => isFunction(args[cb]))) {
     return true;
   }
   return false;
@@ -740,7 +740,7 @@ function promisify$1(name, fn) {
 }
 function formatApiArgs(args, options) {
   const params = args[0];
-  if (!options || !isPlainObject(options.formatArgs) && isPlainObject(params)) {
+  if (!options || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) {
     return;
   }
   const formatArgs = options.formatArgs;
@@ -907,20 +907,20 @@ function dedupeHooks(hooks) {
   return res;
 }
 const addInterceptor = defineSyncApi(API_ADD_INTERCEPTOR, (method, interceptor) => {
-  if (isString(method) && isPlainObject(interceptor)) {
+  if (isString(method) && isPlainObject$1(interceptor)) {
     mergeInterceptorHook(scopedInterceptors[method] || (scopedInterceptors[method] = {}), interceptor);
-  } else if (isPlainObject(method)) {
+  } else if (isPlainObject$1(method)) {
     mergeInterceptorHook(globalInterceptors, method);
   }
 }, AddInterceptorProtocol);
 const removeInterceptor = defineSyncApi(API_REMOVE_INTERCEPTOR, (method, interceptor) => {
   if (isString(method)) {
-    if (isPlainObject(interceptor)) {
+    if (isPlainObject$1(interceptor)) {
       removeInterceptorHook(scopedInterceptors[method], interceptor);
     } else {
       delete scopedInterceptors[method];
     }
-  } else if (isPlainObject(method)) {
+  } else if (isPlainObject$1(method)) {
     removeInterceptorHook(globalInterceptors, method);
   }
 }, RemoveInterceptorProtocol);
@@ -1116,7 +1116,7 @@ function initWrapper(protocols2) {
     };
   }
   function processArgs(methodName, fromArgs, argsOption = {}, returnValue = {}, keepFromArgs = false) {
-    if (isPlainObject(fromArgs)) {
+    if (isPlainObject$1(fromArgs)) {
       const toArgs = keepFromArgs === true ? fromArgs : {};
       if (isFunction(argsOption)) {
         argsOption = argsOption(fromArgs, toArgs) || {};
@@ -1131,7 +1131,7 @@ function initWrapper(protocols2) {
             console.warn(`微信小程序 ${methodName} 暂不支持 ${key}`);
           } else if (isString(keyOption)) {
             toArgs[keyOption] = fromArgs[key];
-          } else if (isPlainObject(keyOption)) {
+          } else if (isPlainObject$1(keyOption)) {
             toArgs[keyOption.name ? keyOption.name : key] = keyOption.value;
           }
         } else if (CALLBACKS.indexOf(key) !== -1) {
@@ -1658,6 +1658,13 @@ function recordEffectScope(effect, scope = activeEffectScope) {
 function getCurrentScope() {
   return activeEffectScope;
 }
+function onScopeDispose(fn) {
+  if (activeEffectScope) {
+    activeEffectScope.cleanups.push(fn);
+  } else {
+    warn$1(`onScopeDispose() is called when there is no active effect scope to be associated with.`);
+  }
+}
 const createDep = (effects) => {
   const dep = new Set(effects);
   dep.w = 0;
@@ -1894,6 +1901,10 @@ function triggerEffect(effect, debuggerEventExtraInfo) {
     }
   }
 }
+function getDepFromReactive(object, key) {
+  var _a2;
+  return (_a2 = targetMap.get(object)) === null || _a2 === void 0 ? void 0 : _a2.get(key);
+}
 const isNonTrackableKeys = /* @__PURE__ */ makeMap(`__proto__,__v_isRef,__isVue`);
 const builtInSymbols = new Set(
   /* @__PURE__ */ Object.getOwnPropertyNames(Symbol).filter((key) => key !== "arguments" && key !== "caller").map((key) => Symbol[key]).filter(isSymbol)
@@ -2528,6 +2539,38 @@ const shallowUnwrapHandlers = {
 function proxyRefs(objectWithRefs) {
   return isReactive(objectWithRefs) ? objectWithRefs : new Proxy(objectWithRefs, shallowUnwrapHandlers);
 }
+function toRefs(object) {
+  if (!isProxy(object)) {
+    console.warn(`toRefs() expects a reactive object but received a plain one.`);
+  }
+  const ret = isArray(object) ? new Array(object.length) : {};
+  for (const key in object) {
+    ret[key] = toRef(object, key);
+  }
+  return ret;
+}
+class ObjectRefImpl {
+  constructor(_object, _key, _defaultValue) {
+    this._object = _object;
+    this._key = _key;
+    this._defaultValue = _defaultValue;
+    this.__v_isRef = true;
+  }
+  get value() {
+    const val = this._object[this._key];
+    return val === void 0 ? this._defaultValue : val;
+  }
+  set value(newVal) {
+    this._object[this._key] = newVal;
+  }
+  get dep() {
+    return getDepFromReactive(toRaw(this._object), this._key);
+  }
+}
+function toRef(object, key, defaultValue) {
+  const val = object[key];
+  return isRef(val) ? val : new ObjectRefImpl(object, key, defaultValue);
+}
 var _a;
 class ComputedRefImpl {
   constructor(getter, _setter, isReadonly2, isSSR) {
@@ -3467,7 +3510,7 @@ function traverse(value, seen) {
     value.forEach((v) => {
       traverse(v, seen);
     });
-  } else if (isPlainObject(value)) {
+  } else if (isPlainObject$1(value)) {
     for (const key in value) {
       traverse(value[key], seen);
     }
@@ -3543,43 +3586,43 @@ function injectHook(type, hook, target = currentInstance, prepend = false) {
     warn(`${apiName} is called when there is no active component instance to be associated with. Lifecycle injection APIs can only be used during execution of setup().`);
   }
 }
-const createHook = (lifecycle) => (hook, target = currentInstance) => (
+const createHook$1 = (lifecycle) => (hook, target = currentInstance) => (
   // post-create lifecycle registrations are noops during SSR (except for serverPrefetch)
   (!isInSSRComponentSetup || lifecycle === "sp") && injectHook(lifecycle, (...args) => hook(...args), target)
 );
-const onBeforeMount = createHook(
+const onBeforeMount = createHook$1(
   "bm"
   /* LifecycleHooks.BEFORE_MOUNT */
 );
-const onMounted = createHook(
+const onMounted = createHook$1(
   "m"
   /* LifecycleHooks.MOUNTED */
 );
-const onBeforeUpdate = createHook(
+const onBeforeUpdate = createHook$1(
   "bu"
   /* LifecycleHooks.BEFORE_UPDATE */
 );
-const onUpdated = createHook(
+const onUpdated = createHook$1(
   "u"
   /* LifecycleHooks.UPDATED */
 );
-const onBeforeUnmount = createHook(
+const onBeforeUnmount = createHook$1(
   "bum"
   /* LifecycleHooks.BEFORE_UNMOUNT */
 );
-const onUnmounted = createHook(
+const onUnmounted = createHook$1(
   "um"
   /* LifecycleHooks.UNMOUNTED */
 );
-const onServerPrefetch = createHook(
+const onServerPrefetch = createHook$1(
   "sp"
   /* LifecycleHooks.SERVER_PREFETCH */
 );
-const onRenderTriggered = createHook(
+const onRenderTriggered = createHook$1(
   "rtg"
   /* LifecycleHooks.RENDER_TRIGGERED */
 );
-const onRenderTracked = createHook(
+const onRenderTracked = createHook$1(
   "rtc"
   /* LifecycleHooks.RENDER_TRACKED */
 );
@@ -5707,7 +5750,7 @@ function initHooks$1(options, instance, publicThis) {
 function applyOptions$2(options, instance, publicThis) {
   initHooks$1(options, instance, publicThis);
 }
-function set(target, key, val) {
+function set$3(target, key, val) {
   return target[key] = val;
 }
 function createErrorHandler(app) {
@@ -5806,7 +5849,7 @@ function initApp(app) {
     uniIdMixin(globalProperties);
   }
   {
-    globalProperties.$set = set;
+    globalProperties.$set = set$3;
     globalProperties.$applyOptions = applyOptions$2;
   }
   {
@@ -5928,10 +5971,10 @@ function patchMPEvent(event) {
       event.detail = typeof event.detail === "object" ? event.detail : {};
       event.detail.markerId = event.markerId;
     }
-    if (isPlainObject(event.detail) && hasOwn(event.detail, "checked") && !hasOwn(event.detail, "value")) {
+    if (isPlainObject$1(event.detail) && hasOwn(event.detail, "checked") && !hasOwn(event.detail, "value")) {
       event.detail.value = event.detail.checked;
     }
-    if (isPlainObject(event.detail)) {
+    if (isPlainObject$1(event.detail)) {
       event.target = extend({}, event.target, event.detail);
     }
   }
@@ -6479,10 +6522,10 @@ function initPageProps({ properties }, rawProps) {
         value: ""
       };
     });
-  } else if (isPlainObject(rawProps)) {
+  } else if (isPlainObject$1(rawProps)) {
     Object.keys(rawProps).forEach((key) => {
       const opts = rawProps[key];
-      if (isPlainObject(opts)) {
+      if (isPlainObject$1(opts)) {
         let value = opts.default;
         if (isFunction(value)) {
           value = value();
@@ -6506,7 +6549,7 @@ function findPropsData(properties, isPage2) {
 }
 function findPagePropsData(properties) {
   const propsData = {};
-  if (isPlainObject(properties)) {
+  if (isPlainObject$1(properties)) {
     Object.keys(properties).forEach((name) => {
       if (builtInProps.indexOf(name) === -1) {
         propsData[name] = properties[name];
@@ -6850,6 +6893,602 @@ const createSubpackageApp = initCreateSubpackageApp();
   wx.createPluginApp = global.createPluginApp = createPluginApp;
   wx.createSubpackageApp = global.createSubpackageApp = createSubpackageApp;
 }
+var isVue2 = false;
+function set(target, key, val) {
+  if (Array.isArray(target)) {
+    target.length = Math.max(target.length, key);
+    target.splice(key, 1, val);
+    return val;
+  }
+  target[key] = val;
+  return val;
+}
+function del(target, key) {
+  if (Array.isArray(target)) {
+    target.splice(key, 1);
+    return;
+  }
+  delete target[key];
+}
+/*!
+  * pinia v2.0.32
+  * (c) 2023 Eduardo San Martin Morote
+  * @license MIT
+  */
+let activePinia;
+const setActivePinia = (pinia) => activePinia = pinia;
+const piniaSymbol = Symbol("pinia");
+function isPlainObject(o2) {
+  return o2 && typeof o2 === "object" && Object.prototype.toString.call(o2) === "[object Object]" && typeof o2.toJSON !== "function";
+}
+var MutationType;
+(function(MutationType2) {
+  MutationType2["direct"] = "direct";
+  MutationType2["patchObject"] = "patch object";
+  MutationType2["patchFunction"] = "patch function";
+})(MutationType || (MutationType = {}));
+const IS_CLIENT = typeof window !== "undefined";
+const USE_DEVTOOLS = IS_CLIENT;
+const componentStateTypes = [];
+const getStoreType = (id) => "🍍 " + id;
+function addStoreToDevtools(app, store) {
+  if (!componentStateTypes.includes(getStoreType(store.$id))) {
+    componentStateTypes.push(getStoreType(store.$id));
+  }
+}
+function patchActionForGrouping(store, actionNames) {
+  const actions = actionNames.reduce((storeActions, actionName) => {
+    storeActions[actionName] = toRaw(store)[actionName];
+    return storeActions;
+  }, {});
+  for (const actionName in actions) {
+    store[actionName] = function() {
+      const trackedStore = new Proxy(store, {
+        get(...args) {
+          return Reflect.get(...args);
+        },
+        set(...args) {
+          return Reflect.set(...args);
+        }
+      });
+      return actions[actionName].apply(trackedStore, arguments);
+    };
+  }
+}
+function devtoolsPlugin({ app, store, options }) {
+  if (store.$id.startsWith("__hot:")) {
+    return;
+  }
+  if (options.state) {
+    store._isOptionsAPI = true;
+  }
+  if (typeof options.state === "function") {
+    patchActionForGrouping(
+      // @ts-expect-error: can cast the store...
+      store,
+      Object.keys(options.actions)
+    );
+    const originalHotUpdate = store._hotUpdate;
+    toRaw(store)._hotUpdate = function(newStore) {
+      originalHotUpdate.apply(this, arguments);
+      patchActionForGrouping(store, Object.keys(newStore._hmrPayload.actions));
+    };
+  }
+  addStoreToDevtools(
+    app,
+    // FIXME: is there a way to allow the assignment from Store<Id, S, G, A> to StoreGeneric?
+    store
+  );
+}
+function createPinia() {
+  const scope = effectScope(true);
+  const state = scope.run(() => ref({}));
+  let _p = [];
+  let toBeInstalled = [];
+  const pinia = markRaw({
+    install(app) {
+      setActivePinia(pinia);
+      {
+        pinia._a = app;
+        app.provide(piniaSymbol, pinia);
+        app.config.globalProperties.$pinia = pinia;
+        toBeInstalled.forEach((plugin2) => _p.push(plugin2));
+        toBeInstalled = [];
+      }
+    },
+    use(plugin2) {
+      if (!this._a && !isVue2) {
+        toBeInstalled.push(plugin2);
+      } else {
+        _p.push(plugin2);
+      }
+      return this;
+    },
+    _p,
+    // it's actually undefined here
+    // @ts-expect-error
+    _a: null,
+    _e: scope,
+    _s: /* @__PURE__ */ new Map(),
+    state
+  });
+  if (USE_DEVTOOLS && typeof Proxy !== "undefined") {
+    pinia.use(devtoolsPlugin);
+  }
+  return pinia;
+}
+function patchObject(newState, oldState) {
+  for (const key in oldState) {
+    const subPatch = oldState[key];
+    if (!(key in newState)) {
+      continue;
+    }
+    const targetValue = newState[key];
+    if (isPlainObject(targetValue) && isPlainObject(subPatch) && !isRef(subPatch) && !isReactive(subPatch)) {
+      newState[key] = patchObject(targetValue, subPatch);
+    } else {
+      {
+        newState[key] = subPatch;
+      }
+    }
+  }
+  return newState;
+}
+const noop = () => {
+};
+function addSubscription(subscriptions, callback, detached, onCleanup = noop) {
+  subscriptions.push(callback);
+  const removeSubscription = () => {
+    const idx = subscriptions.indexOf(callback);
+    if (idx > -1) {
+      subscriptions.splice(idx, 1);
+      onCleanup();
+    }
+  };
+  if (!detached && getCurrentScope()) {
+    onScopeDispose(removeSubscription);
+  }
+  return removeSubscription;
+}
+function triggerSubscriptions(subscriptions, ...args) {
+  subscriptions.slice().forEach((callback) => {
+    callback(...args);
+  });
+}
+function mergeReactiveObjects(target, patchToApply) {
+  if (target instanceof Map && patchToApply instanceof Map) {
+    patchToApply.forEach((value, key) => target.set(key, value));
+  }
+  if (target instanceof Set && patchToApply instanceof Set) {
+    patchToApply.forEach(target.add, target);
+  }
+  for (const key in patchToApply) {
+    if (!patchToApply.hasOwnProperty(key))
+      continue;
+    const subPatch = patchToApply[key];
+    const targetValue = target[key];
+    if (isPlainObject(targetValue) && isPlainObject(subPatch) && target.hasOwnProperty(key) && !isRef(subPatch) && !isReactive(subPatch)) {
+      target[key] = mergeReactiveObjects(targetValue, subPatch);
+    } else {
+      target[key] = subPatch;
+    }
+  }
+  return target;
+}
+const skipHydrateSymbol = Symbol("pinia:skipHydration");
+function shouldHydrate(obj) {
+  return !isPlainObject(obj) || !obj.hasOwnProperty(skipHydrateSymbol);
+}
+const { assign } = Object;
+function isComputed(o2) {
+  return !!(isRef(o2) && o2.effect);
+}
+function createOptionsStore(id, options, pinia, hot) {
+  const { state, actions, getters } = options;
+  const initialState = pinia.state.value[id];
+  let store;
+  function setup() {
+    if (!initialState && !hot) {
+      {
+        pinia.state.value[id] = state ? state() : {};
+      }
+    }
+    const localState = hot ? (
+      // use ref() to unwrap refs inside state TODO: check if this is still necessary
+      toRefs(ref(state ? state() : {}).value)
+    ) : toRefs(pinia.state.value[id]);
+    return assign(localState, actions, Object.keys(getters || {}).reduce((computedGetters, name) => {
+      if (name in localState) {
+        console.warn(`[🍍]: A getter cannot have the same name as another state property. Rename one of them. Found with "${name}" in store "${id}".`);
+      }
+      computedGetters[name] = markRaw(computed(() => {
+        setActivePinia(pinia);
+        const store2 = pinia._s.get(id);
+        return getters[name].call(store2, store2);
+      }));
+      return computedGetters;
+    }, {}));
+  }
+  store = createSetupStore(id, setup, options, pinia, hot, true);
+  store.$reset = function $reset() {
+    const newState = state ? state() : {};
+    this.$patch(($state) => {
+      assign($state, newState);
+    });
+  };
+  return store;
+}
+function createSetupStore($id, setup, options = {}, pinia, hot, isOptionsStore) {
+  let scope;
+  const optionsForPlugin = assign({ actions: {} }, options);
+  if (!pinia._e.active) {
+    throw new Error("Pinia destroyed");
+  }
+  const $subscribeOptions = {
+    deep: true
+    // flush: 'post',
+  };
+  {
+    $subscribeOptions.onTrigger = (event) => {
+      if (isListening) {
+        debuggerEvents = event;
+      } else if (isListening == false && !store._hotUpdating) {
+        if (Array.isArray(debuggerEvents)) {
+          debuggerEvents.push(event);
+        } else {
+          console.error("🍍 debuggerEvents should be an array. This is most likely an internal Pinia bug.");
+        }
+      }
+    };
+  }
+  let isListening;
+  let isSyncListening;
+  let subscriptions = markRaw([]);
+  let actionSubscriptions = markRaw([]);
+  let debuggerEvents;
+  const initialState = pinia.state.value[$id];
+  if (!isOptionsStore && !initialState && !hot) {
+    {
+      pinia.state.value[$id] = {};
+    }
+  }
+  const hotState = ref({});
+  let activeListener;
+  function $patch(partialStateOrMutator) {
+    let subscriptionMutation;
+    isListening = isSyncListening = false;
+    {
+      debuggerEvents = [];
+    }
+    if (typeof partialStateOrMutator === "function") {
+      partialStateOrMutator(pinia.state.value[$id]);
+      subscriptionMutation = {
+        type: MutationType.patchFunction,
+        storeId: $id,
+        events: debuggerEvents
+      };
+    } else {
+      mergeReactiveObjects(pinia.state.value[$id], partialStateOrMutator);
+      subscriptionMutation = {
+        type: MutationType.patchObject,
+        payload: partialStateOrMutator,
+        storeId: $id,
+        events: debuggerEvents
+      };
+    }
+    const myListenerId = activeListener = Symbol();
+    nextTick$1().then(() => {
+      if (activeListener === myListenerId) {
+        isListening = true;
+      }
+    });
+    isSyncListening = true;
+    triggerSubscriptions(subscriptions, subscriptionMutation, pinia.state.value[$id]);
+  }
+  const $reset = () => {
+    throw new Error(`🍍: Store "${$id}" is built using the setup syntax and does not implement $reset().`);
+  };
+  function $dispose() {
+    scope.stop();
+    subscriptions = [];
+    actionSubscriptions = [];
+    pinia._s.delete($id);
+  }
+  function wrapAction(name, action) {
+    return function() {
+      setActivePinia(pinia);
+      const args = Array.from(arguments);
+      const afterCallbackList = [];
+      const onErrorCallbackList = [];
+      function after(callback) {
+        afterCallbackList.push(callback);
+      }
+      function onError(callback) {
+        onErrorCallbackList.push(callback);
+      }
+      triggerSubscriptions(actionSubscriptions, {
+        args,
+        name,
+        store,
+        after,
+        onError
+      });
+      let ret;
+      try {
+        ret = action.apply(this && this.$id === $id ? this : store, args);
+      } catch (error) {
+        triggerSubscriptions(onErrorCallbackList, error);
+        throw error;
+      }
+      if (ret instanceof Promise) {
+        return ret.then((value) => {
+          triggerSubscriptions(afterCallbackList, value);
+          return value;
+        }).catch((error) => {
+          triggerSubscriptions(onErrorCallbackList, error);
+          return Promise.reject(error);
+        });
+      }
+      triggerSubscriptions(afterCallbackList, ret);
+      return ret;
+    };
+  }
+  const _hmrPayload = /* @__PURE__ */ markRaw({
+    actions: {},
+    getters: {},
+    state: [],
+    hotState
+  });
+  const partialStore = {
+    _p: pinia,
+    // _s: scope,
+    $id,
+    $onAction: addSubscription.bind(null, actionSubscriptions),
+    $patch,
+    $reset,
+    $subscribe(callback, options2 = {}) {
+      const removeSubscription = addSubscription(subscriptions, callback, options2.detached, () => stopWatcher());
+      const stopWatcher = scope.run(() => watch(() => pinia.state.value[$id], (state) => {
+        if (options2.flush === "sync" ? isSyncListening : isListening) {
+          callback({
+            storeId: $id,
+            type: MutationType.direct,
+            events: debuggerEvents
+          }, state);
+        }
+      }, assign({}, $subscribeOptions, options2)));
+      return removeSubscription;
+    },
+    $dispose
+  };
+  const store = reactive(
+    assign(
+      {
+        _hmrPayload,
+        _customProperties: markRaw(/* @__PURE__ */ new Set())
+        // devtools custom properties
+      },
+      partialStore
+      // must be added later
+      // setupStore
+    )
+  );
+  pinia._s.set($id, store);
+  const setupStore = pinia._e.run(() => {
+    scope = effectScope();
+    return scope.run(() => setup());
+  });
+  for (const key in setupStore) {
+    const prop = setupStore[key];
+    if (isRef(prop) && !isComputed(prop) || isReactive(prop)) {
+      if (hot) {
+        set(hotState.value, key, toRef(setupStore, key));
+      } else if (!isOptionsStore) {
+        if (initialState && shouldHydrate(prop)) {
+          if (isRef(prop)) {
+            prop.value = initialState[key];
+          } else {
+            mergeReactiveObjects(prop, initialState[key]);
+          }
+        }
+        {
+          pinia.state.value[$id][key] = prop;
+        }
+      }
+      {
+        _hmrPayload.state.push(key);
+      }
+    } else if (typeof prop === "function") {
+      const actionValue = hot ? prop : wrapAction(key, prop);
+      {
+        setupStore[key] = actionValue;
+      }
+      {
+        _hmrPayload.actions[key] = prop;
+      }
+      optionsForPlugin.actions[key] = prop;
+    } else {
+      if (isComputed(prop)) {
+        _hmrPayload.getters[key] = isOptionsStore ? (
+          // @ts-expect-error
+          options.getters[key]
+        ) : prop;
+        if (IS_CLIENT) {
+          const getters = setupStore._getters || // @ts-expect-error: same
+          (setupStore._getters = markRaw([]));
+          getters.push(key);
+        }
+      }
+    }
+  }
+  {
+    assign(store, setupStore);
+    assign(toRaw(store), setupStore);
+  }
+  Object.defineProperty(store, "$state", {
+    get: () => hot ? hotState.value : pinia.state.value[$id],
+    set: (state) => {
+      if (hot) {
+        throw new Error("cannot set hotState");
+      }
+      $patch(($state) => {
+        assign($state, state);
+      });
+    }
+  });
+  {
+    store._hotUpdate = markRaw((newStore) => {
+      store._hotUpdating = true;
+      newStore._hmrPayload.state.forEach((stateKey) => {
+        if (stateKey in store.$state) {
+          const newStateTarget = newStore.$state[stateKey];
+          const oldStateSource = store.$state[stateKey];
+          if (typeof newStateTarget === "object" && isPlainObject(newStateTarget) && isPlainObject(oldStateSource)) {
+            patchObject(newStateTarget, oldStateSource);
+          } else {
+            newStore.$state[stateKey] = oldStateSource;
+          }
+        }
+        set(store, stateKey, toRef(newStore.$state, stateKey));
+      });
+      Object.keys(store.$state).forEach((stateKey) => {
+        if (!(stateKey in newStore.$state)) {
+          del(store, stateKey);
+        }
+      });
+      isListening = false;
+      isSyncListening = false;
+      pinia.state.value[$id] = toRef(newStore._hmrPayload, "hotState");
+      isSyncListening = true;
+      nextTick$1().then(() => {
+        isListening = true;
+      });
+      for (const actionName in newStore._hmrPayload.actions) {
+        const action = newStore[actionName];
+        set(store, actionName, wrapAction(actionName, action));
+      }
+      for (const getterName in newStore._hmrPayload.getters) {
+        const getter = newStore._hmrPayload.getters[getterName];
+        const getterValue = isOptionsStore ? (
+          // special handling of options api
+          computed(() => {
+            setActivePinia(pinia);
+            return getter.call(store, store);
+          })
+        ) : getter;
+        set(store, getterName, getterValue);
+      }
+      Object.keys(store._hmrPayload.getters).forEach((key) => {
+        if (!(key in newStore._hmrPayload.getters)) {
+          del(store, key);
+        }
+      });
+      Object.keys(store._hmrPayload.actions).forEach((key) => {
+        if (!(key in newStore._hmrPayload.actions)) {
+          del(store, key);
+        }
+      });
+      store._hmrPayload = newStore._hmrPayload;
+      store._getters = newStore._getters;
+      store._hotUpdating = false;
+    });
+  }
+  if (USE_DEVTOOLS) {
+    const nonEnumerable = {
+      writable: true,
+      configurable: true,
+      // avoid warning on devtools trying to display this property
+      enumerable: false
+    };
+    ["_p", "_hmrPayload", "_getters", "_customProperties"].forEach((p2) => {
+      Object.defineProperty(store, p2, assign({ value: store[p2] }, nonEnumerable));
+    });
+  }
+  pinia._p.forEach((extender) => {
+    if (USE_DEVTOOLS) {
+      const extensions = scope.run(() => extender({
+        store,
+        app: pinia._a,
+        pinia,
+        options: optionsForPlugin
+      }));
+      Object.keys(extensions || {}).forEach((key) => store._customProperties.add(key));
+      assign(store, extensions);
+    } else {
+      assign(store, scope.run(() => extender({
+        store,
+        app: pinia._a,
+        pinia,
+        options: optionsForPlugin
+      })));
+    }
+  });
+  if (store.$state && typeof store.$state === "object" && typeof store.$state.constructor === "function" && !store.$state.constructor.toString().includes("[native code]")) {
+    console.warn(`[🍍]: The "state" must be a plain object. It cannot be
+	state: () => new MyClass()
+Found in store "${store.$id}".`);
+  }
+  if (initialState && isOptionsStore && options.hydrate) {
+    options.hydrate(store.$state, initialState);
+  }
+  isListening = true;
+  isSyncListening = true;
+  return store;
+}
+function defineStore(idOrOptions, setup, setupOptions) {
+  let id;
+  let options;
+  const isSetupStore = typeof setup === "function";
+  if (typeof idOrOptions === "string") {
+    id = idOrOptions;
+    options = isSetupStore ? setupOptions : setup;
+  } else {
+    options = idOrOptions;
+    id = idOrOptions.id;
+  }
+  function useStore(pinia, hot) {
+    const currentInstance2 = getCurrentInstance();
+    pinia = // in test mode, ignore the argument provided as we can always retrieve a
+    // pinia instance with getActivePinia()
+    pinia || currentInstance2 && inject(piniaSymbol, null);
+    if (pinia)
+      setActivePinia(pinia);
+    if (!activePinia) {
+      throw new Error(`[🍍]: getActivePinia was called with no active Pinia. Did you forget to install pinia?
+	const pinia = createPinia()
+	app.use(pinia)
+This will fail in production.`);
+    }
+    pinia = activePinia;
+    if (!pinia._s.has(id)) {
+      if (isSetupStore) {
+        createSetupStore(id, setup, options, pinia);
+      } else {
+        createOptionsStore(id, options, pinia);
+      }
+      {
+        useStore._pinia = pinia;
+      }
+    }
+    const store = pinia._s.get(id);
+    if (hot) {
+      const hotId = "__hot:" + id;
+      const newStore = isSetupStore ? createSetupStore(hotId, setup, options, pinia, true) : createOptionsStore(hotId, assign({}, options), pinia, true);
+      hot._hotUpdate(newStore);
+      delete pinia.state.value[hotId];
+      pinia._s.delete(hotId);
+    }
+    if (IS_CLIENT && currentInstance2 && currentInstance2.proxy && // avoid adding stores that are just built for hot module replacement
+    !hot) {
+      const vm = currentInstance2.proxy;
+      const cache = "_pStores" in vm ? vm._pStores : vm._pStores = {};
+      cache[id] = store;
+    }
+    return store;
+  }
+  useStore.$id = id;
+  return useStore;
+}
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getAugmentedNamespace(n2) {
   if (n2.__esModule)
@@ -7437,111 +8076,15 @@ const require$$1 = /* @__PURE__ */ getAugmentedNamespace(__viteBrowserExternal$1
   })();
 })(md5$1);
 const md5 = md5Exports;
-var isVue2 = false;
-/*!
-  * pinia v2.0.32
-  * (c) 2023 Eduardo San Martin Morote
-  * @license MIT
-  */
-const piniaSymbol = Symbol("pinia");
-var MutationType;
-(function(MutationType2) {
-  MutationType2["direct"] = "direct";
-  MutationType2["patchObject"] = "patch object";
-  MutationType2["patchFunction"] = "patch function";
-})(MutationType || (MutationType = {}));
-const IS_CLIENT = typeof window !== "undefined";
-const USE_DEVTOOLS = IS_CLIENT;
-const componentStateTypes = [];
-const getStoreType = (id) => "🍍 " + id;
-function addStoreToDevtools(app, store) {
-  if (!componentStateTypes.includes(getStoreType(store.$id))) {
-    componentStateTypes.push(getStoreType(store.$id));
-  }
-}
-function patchActionForGrouping(store, actionNames) {
-  const actions = actionNames.reduce((storeActions, actionName) => {
-    storeActions[actionName] = toRaw(store)[actionName];
-    return storeActions;
-  }, {});
-  for (const actionName in actions) {
-    store[actionName] = function() {
-      const trackedStore = new Proxy(store, {
-        get(...args) {
-          return Reflect.get(...args);
-        },
-        set(...args) {
-          return Reflect.set(...args);
-        }
-      });
-      return actions[actionName].apply(trackedStore, arguments);
-    };
-  }
-}
-function devtoolsPlugin({ app, store, options }) {
-  if (store.$id.startsWith("__hot:")) {
-    return;
-  }
-  if (options.state) {
-    store._isOptionsAPI = true;
-  }
-  if (typeof options.state === "function") {
-    patchActionForGrouping(
-      // @ts-expect-error: can cast the store...
-      store,
-      Object.keys(options.actions)
-    );
-    const originalHotUpdate = store._hotUpdate;
-    toRaw(store)._hotUpdate = function(newStore) {
-      originalHotUpdate.apply(this, arguments);
-      patchActionForGrouping(store, Object.keys(newStore._hmrPayload.actions));
-    };
-  }
-  addStoreToDevtools(
-    app,
-    // FIXME: is there a way to allow the assignment from Store<Id, S, G, A> to StoreGeneric?
-    store
-  );
-}
-function createPinia() {
-  const scope = effectScope(true);
-  const state = scope.run(() => ref({}));
-  let _p = [];
-  let toBeInstalled = [];
-  const pinia = markRaw({
-    install(app) {
-      {
-        pinia._a = app;
-        app.provide(piniaSymbol, pinia);
-        app.config.globalProperties.$pinia = pinia;
-        toBeInstalled.forEach((plugin2) => _p.push(plugin2));
-        toBeInstalled = [];
-      }
-    },
-    use(plugin2) {
-      if (!this._a && !isVue2) {
-        toBeInstalled.push(plugin2);
-      } else {
-        _p.push(plugin2);
-      }
-      return this;
-    },
-    _p,
-    // it's actually undefined here
-    // @ts-expect-error
-    _a: null,
-    _e: scope,
-    _s: /* @__PURE__ */ new Map(),
-    state
-  });
-  if (USE_DEVTOOLS && typeof Proxy !== "undefined") {
-    pinia.use(devtoolsPlugin);
-  }
-  return pinia;
-}
+const createHook = (lifecycle) => (hook, target = getCurrentInstance()) => {
+  !isInSSRComponentSetup && injectHook(lifecycle, hook, target);
+};
+const onPullDownRefresh = /* @__PURE__ */ createHook(ON_PULL_DOWN_REFRESH);
 exports._export_sfc = _export_sfc;
+exports.computed = computed;
 exports.createPinia = createPinia;
 exports.createSSRApp = createSSRApp;
+exports.defineStore = defineStore;
 exports.e = e;
 exports.f = f;
 exports.index = index;
@@ -7549,8 +8092,12 @@ exports.md5 = md5;
 exports.n = n;
 exports.nextTick$1 = nextTick$1;
 exports.o = o;
+exports.onPullDownRefresh = onPullDownRefresh;
 exports.p = p;
 exports.r = r;
+exports.reactive = reactive;
+exports.ref = ref;
 exports.resolveComponent = resolveComponent;
 exports.s = s;
 exports.t = t;
+exports.unref = unref;
diff --git a/unpackage/dist/dev/mp-weixin/components/privacyRadion/privacyRadion.js b/unpackage/dist/dev/mp-weixin/components/privacyRadion/privacyRadion.js
index 8c05aca..14caab6 100644
--- a/unpackage/dist/dev/mp-weixin/components/privacyRadion/privacyRadion.js
+++ b/unpackage/dist/dev/mp-weixin/components/privacyRadion/privacyRadion.js
@@ -8,7 +8,7 @@ const _sfc_main = {
       this.$emit("changeRadio", val);
     },
     async goPage(type) {
-      this.$goPage("/pages/userCenter/login/privacyAgreement/privacyAgreement?type=" + type);
+      this.$goPage("/pages/subPage/privacyAgreement/privacyAgreement?type=" + type);
     }
   }
 };
@@ -29,6 +29,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       checked: $props.isCheck,
       shape: "circle",
       label: "已阅读并同意",
+      activeColor: "#DE3A26",
       labelSize: 12
     }),
     c: common_vendor.o(($event) => $options.goPage(2)),
diff --git a/unpackage/dist/dev/mp-weixin/config/api.js b/unpackage/dist/dev/mp-weixin/config/api.js
index 41ec70d..0368777 100644
--- a/unpackage/dist/dev/mp-weixin/config/api.js
+++ b/unpackage/dist/dev/mp-weixin/config/api.js
@@ -1,4 +1,18 @@
 "use strict";
 const uni_modules_uviewPlus_index = require("../uni_modules/uview-plus/index.js");
 const weixinLogin = (data) => uni_modules_uviewPlus_index.http.post("member/auth/wx_login", data);
+const getAgreement = (params = {}) => uni_modules_uviewPlus_index.http.get("app/student-record/getAgreement", { params });
+const getNoticeList = (data) => uni_modules_uviewPlus_index.http.post("article/simple_list", data);
+const houseTree = (data) => uni_modules_uviewPlus_index.http.post("house/tree", data);
+const houseRoom = (data) => uni_modules_uviewPlus_index.http.post("house/room_search", data);
+const houseRoomBind = (data) => uni_modules_uviewPlus_index.http.post("house/bind_room", data);
+const getFacetoken = (data) => uni_modules_uviewPlus_index.http.post("face/get_token", data);
+const getFaceResult = (data) => uni_modules_uviewPlus_index.http.post("face/get_result", data);
+exports.getAgreement = getAgreement;
+exports.getFaceResult = getFaceResult;
+exports.getFacetoken = getFacetoken;
+exports.getNoticeList = getNoticeList;
+exports.houseRoom = houseRoom;
+exports.houseRoomBind = houseRoomBind;
+exports.houseTree = houseTree;
 exports.weixinLogin = weixinLogin;
diff --git a/unpackage/dist/dev/mp-weixin/config/request.js b/unpackage/dist/dev/mp-weixin/config/request.js
index 8ee4ae5..b895a59 100644
--- a/unpackage/dist/dev/mp-weixin/config/request.js
+++ b/unpackage/dist/dev/mp-weixin/config/request.js
@@ -1,7 +1,9 @@
 "use strict";
 const common_vendor = require("../common/vendor.js");
 const config_site_config = require("./site.config.js");
+const store_index = require("../store/index.js");
 let { H5_API, WX_API, httpPrefix } = config_site_config.obj;
+const counterStore = store_index.useUserStoreHook();
 let secretKey = "22d90e09d1374f0f9e4accd07d333e55";
 const request = (vm) => {
   common_vendor.index.$u.http.setConfig((config) => {
@@ -18,6 +20,10 @@ const request = (vm) => {
     let hash = common_vendor.md5(strSecretKey);
     config.header["Signature"] = hash;
     config.data = jsonString;
+    let token = counterStore.token;
+    if (token) {
+      config.header.Authorization = "Bearer " + token;
+    }
     let noToken = (_a = config.custom) == null ? void 0 : _a.noToken;
     if (noToken && config.header.Authorization) {
       delete config.header.Authorization;
@@ -43,7 +49,7 @@ const request = (vm) => {
     if (data.code == 401) {
       console.log("报401的接口");
       console.log(response.config.url);
-      return common_vendor.index.$u.debounce(vm.$store.commit("goLogin"), 1500);
+      return;
     }
     const custom = (_a = response.config) == null ? void 0 : _a.custom;
     if (data.code !== 0 && data.code != 406 && data.code != "200240213") {
diff --git a/unpackage/dist/dev/mp-weixin/config/site.config.js b/unpackage/dist/dev/mp-weixin/config/site.config.js
index 2e903ad..31ddc7b 100644
--- a/unpackage/dist/dev/mp-weixin/config/site.config.js
+++ b/unpackage/dist/dev/mp-weixin/config/site.config.js
@@ -6,7 +6,7 @@ let obj = {
   //非代理地址 不要忘记加/
   website: "http://192.168.1.37",
   httpPrefix: "app-api/",
-  imgUrl: "https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/",
+  imgUrl: "http://47.96.82.242/htmls/",
   // 支付测试地址
   // preUrl: 'https://u8wbs.zyebank.cn/cem_ysb_u6/index.html',
   // const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html'
diff --git a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/constants/log.js b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/constants/log.js
new file mode 100644
index 0000000..0b807b3
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/constants/log.js
@@ -0,0 +1,3 @@
+"use strict";
+const Log = { version: "uni_1.0.5__stable", SourceType: "mp_sdk_uni", getIntoIndexPage: "START_INDEX", initSdk: "INIT_SDK", getConfig: "GET_CONFIG", getConfigRetry: "GET_CONFIG_BY_RETRY", webViewResult: "WEBVIEW_RESULT", webViewError: "WEBVIEW_ERROR", navigateToEid: "NAVIGATE_TO_EID", navigateBackFromEid: "NAVIGATE_BACK_FROM_EID", navigateBackFromEidFail: "NAVIGATE_BACK_FROM_EID_FAIL", startEid: "START_EID", startEidFail: "START_EID_FAIL", eidVerifyDone: "EID_VERIFY_DONE", requestFail: "REQUEST_FAIL", requestCatch: "REQUEST_CATCH", onAppShow: "ON_APP_SHOW" };
+exports.Log = Log;
diff --git a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/globalConfig.js b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/globalConfig.js
new file mode 100644
index 0000000..e165671
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/globalConfig.js
@@ -0,0 +1,3 @@
+"use strict";
+const globalConfig = { normalPath: "" };
+exports.globalConfig = globalConfig;
diff --git a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.js b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.js
new file mode 100644
index 0000000..bb9dda6
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.js
@@ -0,0 +1,22 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const mp_ecard_sdk_constants_log = require("../constants/log.js");
+const mp_ecard_sdk_utils_index = require("../utils/index.js");
+const index = { data() {
+  return { token: "" };
+}, onLoad(t) {
+  var { token: t, needJumpPage: e } = t;
+  this.token = t, common_vendor.index.reportLogToEid({ token: t, event: mp_ecard_sdk_constants_log.Log.getIntoIndexPage, errMsg: `进入配置首页,token:${t},needJumpPage:` + e }), mp_ecard_sdk_utils_index.reportStat({ module: "StartIndex", action: "enter" });
+}, onUnload() {
+  mp_ecard_sdk_utils_index.reportStat({ module: "StartIndex", action: "leave" });
+}, methods: { handleStart() {
+  mp_ecard_sdk_utils_index.navigateToEid(this.token);
+} } };
+const _sfc_main = index;
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {
+    a: common_vendor.o((...args) => _ctx.handleStart && _ctx.handleStart(...args))
+  };
+}
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/work/xinjiangMiniProgram/mp_ecard_sdk/index/index.vue"]]);
+wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.json b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.json
new file mode 100644
index 0000000..489e21e
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.json
@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "腾讯云E证通授权",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxml b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxml
new file mode 100644
index 0000000..a87e778
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxml
@@ -0,0 +1 @@
+<view class="auth"><view class="auth-logo"><image src="https://faceid-h5-1254418846.file.myqcloud.com/mp_verify_sdk/images/ecard/logo.png"/></view><view class="title"> 即将进入"eID数字身份"小程序 </view><view class="button-area"><button bindtap="{{a}}"> 确认进入 </button></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxss b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxss
new file mode 100644
index 0000000..77628a2
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxss
@@ -0,0 +1 @@
+.auth{margin-top:128rpx;display:flex;flex-direction:column;align-items:center}.auth-logo{width:200rpx;height:200rpx}.auth-logo image{height:100%;width:100%}.title{margin-top:20rpx;font-size:36rpx;line-height:56rpx}.merchant-name{display:inline;font-weight:700}.sub-title{margin-top:8rpx;font-size:34rpx;line-height:52rpx}.button-area{margin-top:48rpx}.button-area button{width:622rpx;height:96rpx;background:#fff;border:2rpx solid #ddd;font-size:32rpx;font-weight:400;line-height:96rpx;padding:0}.redirect{margin-top:272rpx;display:flex;flex-direction:column;align-items:center}.loading{height:160rpx;width:160rpx;margin-bottom:32rpx}.loading image{height:100%;width:100%}.title{font-size:34rpx;line-height:52rpx}
diff --git a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/main.js b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/main.js
new file mode 100644
index 0000000..75536f8
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/main.js
@@ -0,0 +1,38 @@
+"use strict";
+const common_vendor = require("../common/vendor.js");
+const mp_ecard_sdk_utils_validate = require("./utils/validate.js");
+const mp_ecard_sdk_constants_log = require("./constants/log.js");
+const mp_ecard_sdk_globalConfig = require("./globalConfig.js");
+const mp_ecard_sdk_utils_index = require("./utils/index.js");
+const EIDAppID = "wx0e2cb0b052a91c92";
+function initEid(e = "https://eid.faceid.qq.com", o = "release", n = "https://eid-enhance.faceid.qq.com") {
+  common_vendor.index.eidBaseUrl = e, common_vendor.index.eidEnvVersion = o, common_vendor.index.eidBackUpUrl = n;
+  common_vendor.index.onAppShow((e2) => {
+    console.log("!!!!!!监听onshow事件", e2, common_vendor.index.eidTokenToCallback);
+    var { scene: e2, referrerInfo: o2 } = e2, { appId: o2, extraData: n2 } = o2 || {}, { token: i, verifyDone: t } = n2 || {};
+    1038 === e2 && o2 === EIDAppID && n2 && (t && common_vendor.index.handleEidVerifyDone ? common_vendor.index.eidTokenToCallback && common_vendor.index.eidTokenToCallback === i && (common_vendor.index.eidTokenToCallback = "", common_vendor.index.reportLogToEid({ token: i, event: mp_ecard_sdk_constants_log.Log.navigateBackFromEid, errMsg: `从EID核身完成返回，token:${i},verifyDone:` + t }), console.log("!!!!!!执行回调"), common_vendor.index.handleEidVerifyDone(n2)) : common_vendor.index.reportLogToEid({ token: i, event: mp_ecard_sdk_constants_log.Log.navigateBackFromEidFail, errMsg: `核验未完成或者没有处理核验完成的函数，token:${i},verifyDone:` + t }));
+  });
+  e = common_vendor.index.getSystemInfoSync();
+  const d = e["version"];
+  common_vendor.index.reportLogToEid = function(e2) {
+    var { token: e2 = "", event: o2 = "", errCode: n2 = "", errMsg: i = "", data: t = {} } = e2, r = new Date();
+    const a = { Token: e2, SourceType: mp_ecard_sdk_constants_log.Log.SourceType, SourceVersion: mp_ecard_sdk_constants_log.Log.version, EnvVersion: d, Timestamp: r.getTime(), Event: o2, ErrorCode: "number" == typeof n2 ? n2.toString() : n2, ErrorMsg: i, Data: JSON.stringify(t) };
+    console.log("开始上报日志：", a), common_vendor.index.request({ url: common_vendor.index.eidBaseUrl + "/api/common/ReportEvent", method: "POST", data: a, success(e3) {
+      console.log("上报日志完成：", "payload:", a, "res:", e3);
+    } });
+  };
+}
+function startEid(e) {
+  const { data: o, verifyDoneCallback: n } = e;
+  if (!o || !n)
+    return common_vendor.index.reportLogToEid({ token: i, event: mp_ecard_sdk_constants_log.Log.startEidFail, errMsg: "传入的参数有误" }), void common_vendor.index.showModal({ title: "提示", content: "传入的参数有误", showCancel: false });
+  const { token: i, needJumpPage: t = false, enableEmbedded: r = false, allowFullScreen: a = true } = o;
+  mp_ecard_sdk_utils_validate.validate.isValidateToken(i) ? (common_vendor.index.enableEmbedded = r, common_vendor.index.allowFullScreen = a, common_vendor.index.VerifyEid_TOKEN = i, mp_ecard_sdk_utils_index.reportStat({ module: "EidStart", action: "enter" }), common_vendor.index.handleEidVerifyDone = (e2) => {
+    const o2 = e2["token"];
+    mp_ecard_sdk_utils_index.reportStat({ module: "EidEnd", action: "leave" }), t ? common_vendor.index.navigateBack({ success() {
+      common_vendor.index.reportLogToEid({ token: o2, event: mp_ecard_sdk_constants_log.Log.EidVerifyDone, errMsg: "验证完成，token：" + o2 }), n({ token: o2, verifyDone: true });
+    } }) : (common_vendor.index.reportLogToEid({ token: o2, event: mp_ecard_sdk_constants_log.Log.EidVerifyDone, errMsg: "验证完成，token：" + o2 }), n({ token: o2, verifyDone: true }));
+  }, t ? common_vendor.index.navigateTo({ url: `${mp_ecard_sdk_globalConfig.globalConfig.normalPath}/mp_ecard_sdk/index/index?token=${i}&needJumpPage=` + t }) : mp_ecard_sdk_utils_index.navigateToEid(i)) : (common_vendor.index.reportLogToEid({ token: i, event: mp_ecard_sdk_constants_log.Log.startEidFail, errMsg: "传入的token有误，token:" + i }), common_vendor.index.showModal({ title: "提示", content: "传入的token有误", showCancel: false }));
+}
+exports.initEid = initEid;
+exports.startEid = startEid;
diff --git a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/utils/index.js b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/utils/index.js
new file mode 100644
index 0000000..af463f9
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/utils/index.js
@@ -0,0 +1,23 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const mp_ecard_sdk_constants_log = require("../constants/log.js");
+const navigateToEid = (o) => {
+  console.log("navigateToEid", common_vendor.index.eidEnvVersion), reportStat({ module: "showNavigateToEidDialog", action: "enter" }), (common_vendor.index.enableEmbedded && common_vendor.index.openEmbeddedMiniProgram ? common_vendor.index.openEmbeddedMiniProgram : common_vendor.index.navigateToMiniProgram)({ appId: "wx0e2cb0b052a91c92", path: "pages/huiyan/index", envVersion: common_vendor.index.eidEnvVersion, allowFullScreen: common_vendor.index.allowFullScreen, extraData: { useHuiyan: true, huiyanToken: o }, success(e) {
+    console.log("success", e), common_vendor.index.eidTokenToCallback = o, reportStat({ module: "NavigateToEid", action: "confirm" }), reportStat({ module: "showNavigateToEidDialog", action: "leave" });
+  }, fail(e) {
+    console.log("err", e), reportStat({ module: "NavigateToEid", action: "cancel" });
+  }, complete(e) {
+    reportStat({ module: "NavigateToEidDailog", action: "leave" }), common_vendor.index.reportLogToEid({ token: o, event: mp_ecard_sdk_constants_log.Log.navigateToEid, errMsg: e.errMsg });
+  } });
+}, reportStat = async ({ token: e = common_vendor.index.VerifyEid_TOKEN, module: a, action: n }) => {
+  if (console.log("reportStat", a, n), e)
+    return console.log("上报埋点：", a, n), new Promise((o, i) => {
+      common_vendor.index.request({ url: common_vendor.index.eidBaseUrl + "/api/report/EidEvents?token=" + e, method: "POST", data: { token: e, eidSDKVersion: mp_ecard_sdk_constants_log.Log.version, enableEmbedded: common_vendor.index.enableEmbedded, dataList: [{ startTimestamp: Date.now(), module: a, action: n }] }, success(e2) {
+        o(e2);
+      }, fail(e2) {
+        i(e2);
+      } });
+    });
+};
+exports.navigateToEid = navigateToEid;
+exports.reportStat = reportStat;
diff --git a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/utils/validate.js b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/utils/validate.js
new file mode 100644
index 0000000..242f29d
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/utils/validate.js
@@ -0,0 +1,6 @@
+"use strict";
+function isValidateToken(e) {
+  return /^[a-zA-Z0-9-]{36}$/.test(e);
+}
+const validate = { isValidateToken };
+exports.validate = validate;
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.js b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.js
index 09ac514..81b085b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.js
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.js
@@ -1,23 +1,130 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
-const _sfc_main = {
-  data() {
-    return {
-      currentStep: 1
-    };
-  },
-  computed: {
-    proressWith() {
-      if (this.currentStep == 0) {
-        return 0;
-      } else if (this.currentStep == 1) {
-        return "290rpx";
-      } else {
-        return "100%";
-      }
-    }
-  }
-};
+const common_assets = require("../../../common/assets.js");
+const mp_ecard_sdk_main = require("../../../mp_ecard_sdk/main.js");
+const config_api = require("../../../config/api.js");
+const store_index = require("../../../store/index.js");
+require("../../../mp_ecard_sdk/utils/validate.js");
+require("../../../mp_ecard_sdk/constants/log.js");
+require("../../../mp_ecard_sdk/globalConfig.js");
+require("../../../mp_ecard_sdk/utils/index.js");
+require("../../../uni_modules/uview-plus/index.js");
+require("../../../uni_modules/uview-plus/libs/mixin/mixin.js");
+require("../../../uni_modules/uview-plus/libs/vue.js");
+require("../../../uni_modules/uview-plus/libs/function/index.js");
+require("../../../uni_modules/uview-plus/libs/function/test.js");
+require("../../../uni_modules/uview-plus/libs/function/digit.js");
+require("../../../uni_modules/uview-plus/libs/config/config.js");
+require("../../../uni_modules/uview-plus/libs/util/route.js");
+require("../../../uni_modules/uview-plus/libs/mixin/mpMixin.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/Request.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/dispatchRequest.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/adapters/index.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/helpers/buildURL.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/utils.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/buildFullPath.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/helpers/combineURLs.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/settle.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/InterceptorManager.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/mergeConfig.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/defaults.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/utils/clone.js");
+require("../../../uni_modules/uview-plus/libs/function/colorGradient.js");
+require("../../../uni_modules/uview-plus/libs/function/debounce.js");
+require("../../../uni_modules/uview-plus/libs/function/throttle.js");
+require("../../../uni_modules/uview-plus/libs/config/props.js");
+require("../../../uni_modules/uview-plus/libs/config/props/actionSheet.js");
+require("../../../uni_modules/uview-plus/libs/config/props/album.js");
+require("../../../uni_modules/uview-plus/libs/config/props/alert.js");
+require("../../../uni_modules/uview-plus/libs/config/props/avatar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/avatarGroup.js");
+require("../../../uni_modules/uview-plus/libs/config/props/backtop.js");
+require("../../../uni_modules/uview-plus/libs/config/props/badge.js");
+require("../../../uni_modules/uview-plus/libs/config/props/button.js");
+require("../../../uni_modules/uview-plus/libs/config/props/calendar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/carKeyboard.js");
+require("../../../uni_modules/uview-plus/libs/config/props/cell.js");
+require("../../../uni_modules/uview-plus/libs/config/props/cellGroup.js");
+require("../../../uni_modules/uview-plus/libs/config/props/checkbox.js");
+require("../../../uni_modules/uview-plus/libs/config/props/checkboxGroup.js");
+require("../../../uni_modules/uview-plus/libs/config/props/circleProgress.js");
+require("../../../uni_modules/uview-plus/libs/config/props/code.js");
+require("../../../uni_modules/uview-plus/libs/config/props/codeInput.js");
+require("../../../uni_modules/uview-plus/libs/config/props/col.js");
+require("../../../uni_modules/uview-plus/libs/config/props/collapse.js");
+require("../../../uni_modules/uview-plus/libs/config/props/collapseItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/columnNotice.js");
+require("../../../uni_modules/uview-plus/libs/config/props/countDown.js");
+require("../../../uni_modules/uview-plus/libs/config/props/countTo.js");
+require("../../../uni_modules/uview-plus/libs/config/props/datetimePicker.js");
+require("../../../uni_modules/uview-plus/libs/config/props/divider.js");
+require("../../../uni_modules/uview-plus/libs/config/props/empty.js");
+require("../../../uni_modules/uview-plus/libs/config/props/form.js");
+require("../../../uni_modules/uview-plus/libs/config/props/formItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/gap.js");
+require("../../../uni_modules/uview-plus/libs/config/props/grid.js");
+require("../../../uni_modules/uview-plus/libs/config/props/gridItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/icon.js");
+require("../../../uni_modules/uview-plus/libs/config/props/image.js");
+require("../../../uni_modules/uview-plus/libs/config/props/indexAnchor.js");
+require("../../../uni_modules/uview-plus/libs/config/props/indexList.js");
+require("../../../uni_modules/uview-plus/libs/config/props/input.js");
+require("../../../uni_modules/uview-plus/libs/config/props/keyboard.js");
+require("../../../uni_modules/uview-plus/libs/config/props/line.js");
+require("../../../uni_modules/uview-plus/libs/config/props/lineProgress.js");
+require("../../../uni_modules/uview-plus/libs/config/props/link.js");
+require("../../../uni_modules/uview-plus/libs/config/props/list.js");
+require("../../../uni_modules/uview-plus/libs/config/props/listItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/loadingIcon.js");
+require("../../../uni_modules/uview-plus/libs/config/props/loadingPage.js");
+require("../../../uni_modules/uview-plus/libs/config/props/loadmore.js");
+require("../../../uni_modules/uview-plus/libs/config/props/modal.js");
+require("../../../uni_modules/uview-plus/libs/config/props/navbar.js");
+require("../../../uni_modules/uview-plus/libs/config/color.js");
+require("../../../uni_modules/uview-plus/libs/config/props/noNetwork.js");
+require("../../../uni_modules/uview-plus/libs/config/props/noticeBar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/notify.js");
+require("../../../uni_modules/uview-plus/libs/config/props/numberBox.js");
+require("../../../uni_modules/uview-plus/libs/config/props/numberKeyboard.js");
+require("../../../uni_modules/uview-plus/libs/config/props/overlay.js");
+require("../../../uni_modules/uview-plus/libs/config/props/parse.js");
+require("../../../uni_modules/uview-plus/libs/config/props/picker.js");
+require("../../../uni_modules/uview-plus/libs/config/props/popup.js");
+require("../../../uni_modules/uview-plus/libs/config/props/radio.js");
+require("../../../uni_modules/uview-plus/libs/config/props/radioGroup.js");
+require("../../../uni_modules/uview-plus/libs/config/props/rate.js");
+require("../../../uni_modules/uview-plus/libs/config/props/readMore.js");
+require("../../../uni_modules/uview-plus/libs/config/props/row.js");
+require("../../../uni_modules/uview-plus/libs/config/props/rowNotice.js");
+require("../../../uni_modules/uview-plus/libs/config/props/scrollList.js");
+require("../../../uni_modules/uview-plus/libs/config/props/search.js");
+require("../../../uni_modules/uview-plus/libs/config/props/section.js");
+require("../../../uni_modules/uview-plus/libs/config/props/skeleton.js");
+require("../../../uni_modules/uview-plus/libs/config/props/slider.js");
+require("../../../uni_modules/uview-plus/libs/config/props/statusBar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/steps.js");
+require("../../../uni_modules/uview-plus/libs/config/props/stepsItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/sticky.js");
+require("../../../uni_modules/uview-plus/libs/config/props/subsection.js");
+require("../../../uni_modules/uview-plus/libs/config/props/swipeAction.js");
+require("../../../uni_modules/uview-plus/libs/config/props/swipeActionItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/swiper.js");
+require("../../../uni_modules/uview-plus/libs/config/props/swipterIndicator.js");
+require("../../../uni_modules/uview-plus/libs/config/props/switch.js");
+require("../../../uni_modules/uview-plus/libs/config/props/tabbar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/tabbarItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/tabs.js");
+require("../../../uni_modules/uview-plus/libs/config/props/tag.js");
+require("../../../uni_modules/uview-plus/libs/config/props/text.js");
+require("../../../uni_modules/uview-plus/libs/config/props/textarea.js");
+require("../../../uni_modules/uview-plus/libs/config/props/toast.js");
+require("../../../uni_modules/uview-plus/libs/config/props/toolbar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/tooltip.js");
+require("../../../uni_modules/uview-plus/libs/config/props/transition.js");
+require("../../../uni_modules/uview-plus/libs/config/props/upload.js");
+require("../../../uni_modules/uview-plus/libs/config/zIndex.js");
+require("../../../uni_modules/uview-plus/libs/function/platform.js");
 if (!Array) {
   const _easycom_u_icon2 = common_vendor.resolveComponent("u-icon");
   const _easycom_oneBtn2 = common_vendor.resolveComponent("oneBtn");
@@ -28,21 +135,128 @@ const _easycom_oneBtn = () => "../../../components/oneBtn/oneBtn.js";
 if (!Math) {
   (_easycom_u_icon + _easycom_oneBtn)();
 }
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
-    a: $options.proressWith,
-    b: $data.currentStep ? 1 : "",
-    c: $data.currentStep == 2 ? 1 : "",
-    d: common_vendor.p({
-      name: "arrow-right",
-      color: "#CCCCCC"
-    }),
-    e: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/authentication/comp/select1")),
-    f: common_vendor.p({
-      text: "下一步",
-      disabled: true
-    })
-  };
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-0ab17929"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/authentication/authentication.vue"]]);
+const _sfc_main = {
+  __name: "authentication",
+  setup(__props) {
+    const counterStore = store_index.userStore();
+    const currentStep = common_vendor.ref(0);
+    const proressWith = common_vendor.computed(() => {
+      if (currentStep.value == 1)
+        return "290rpx";
+      if (currentStep.value == 2)
+        return "100%";
+      return 0;
+    });
+    const houseStr = common_vendor.computed(() => {
+      let item = counterStore.chooseHouse;
+      if (!item.houseId)
+        return "";
+      let str = item.communityName + " - " + item.houseTypeName + " - " + item.roomNum;
+      return str;
+    });
+    function nextStep(num) {
+      if (num == 0 && !counterStore.chooseHouse.houseId)
+        return;
+      if (num == 1)
+        currentStep.value = num;
+      if (num == 2) {
+        getpersonfaceFn();
+      }
+      if (num == 3) {
+        counterStore.chooseHouse = {
+          "roomNum": "",
+          "houseType": "",
+          "houseTypeName": "",
+          "communityId": "",
+          "communityName": "",
+          "userName": 0,
+          "idNo": "",
+          "houseId": ""
+        };
+        common_vendor.index.switchTab({
+          url: "/pages/tabbar/index/index"
+        });
+      }
+    }
+    async function getpersonfaceFn() {
+      const { data: res } = await config_api.getFacetoken();
+      console.log("获取到token了,很好");
+      console.log(res);
+      console.log(res.eidToken);
+      goSDK(res.eidToken);
+    }
+    async function GetDetectInfoEnhancedFn(EidToken) {
+      const { data: res } = await config_api.getFaceResult({ token: EidToken });
+      console.log("返回的结果信息");
+      console.log(res);
+      counterStore.upDateHouse("idNo", res.idCard);
+      counterStore.upDateHouse("userName", res.name);
+      counterStore.upDateUseInfo("idCard", res.idCard);
+      counterStore.upDateUseInfo("name", res.name);
+      houseRoomBindFn();
+    }
+    async function houseRoomBindFn() {
+      const { data: res } = await config_api.houseRoomBind(counterStore.chooseHouse);
+      console.log(res);
+      currentStep.value = 2;
+      common_vendor.index.hideLoading();
+    }
+    function goSDK(token) {
+      mp_ecard_sdk_main.startEid({
+        data: {
+          token
+        },
+        verifyDoneCallback(res) {
+          const { token: token2, verifyDone } = res;
+          console.log("收到核身完成的res:", res);
+          console.log("核身的token是:", token2);
+          common_vendor.index.showLoading({
+            title: "正在加载，请稍后……"
+          });
+          GetDetectInfoEnhancedFn(token2);
+          console.log("是否完成核身:", verifyDone);
+        }
+      });
+    }
+    return (_ctx, _cache) => {
+      return common_vendor.e({
+        a: common_vendor.unref(proressWith),
+        b: currentStep.value ? 1 : "",
+        c: currentStep.value == 2 ? 1 : "",
+        d: currentStep.value == 0
+      }, currentStep.value == 0 ? common_vendor.e({
+        e: common_vendor.unref(counterStore).chooseHouse.houseId
+      }, common_vendor.unref(counterStore).chooseHouse.houseId ? {
+        f: common_vendor.t(common_vendor.unref(houseStr))
+      } : {}, {
+        g: common_vendor.p({
+          name: "arrow-right",
+          color: "#CCCCCC"
+        }),
+        h: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/authentication/comp/select1")),
+        i: common_vendor.o(($event) => nextStep(1)),
+        j: common_vendor.p({
+          text: "下一步",
+          disabled: !common_vendor.unref(counterStore).chooseHouse.houseId
+        })
+      }) : {}, {
+        k: currentStep.value == 1
+      }, currentStep.value == 1 ? {
+        l: common_vendor.o(($event) => nextStep(2)),
+        m: common_vendor.p({
+          text: "点击开始实名认证"
+        })
+      } : {}, {
+        n: currentStep.value == 2
+      }, currentStep.value == 2 ? {
+        o: common_assets._imports_0$2,
+        p: common_vendor.o(($event) => nextStep(3)),
+        q: common_vendor.p({
+          text: "返回首页"
+        })
+      } : {});
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-0ab17929"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/authentication/authentication.vue"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.wxml
index 98c0403..d098f40 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.wxml
@@ -1 +1 @@
-<view class="content data-v-0ab17929"><view class="stepTop data-v-0ab17929"><view class="steps flex-b data-v-0ab17929"><view class="proress data-v-0ab17929" style="{{'width:' + a}}"></view><view class="step data-v-0ab17929"><view class="num active data-v-0ab17929">01<view class="text data-v-0ab17929">房屋信息</view></view></view><view class="step data-v-0ab17929"><view class="{{['num', 'data-v-0ab17929', b && 'active']}}">02<view class="text data-v-0ab17929">个人资料</view></view></view><view class="step data-v-0ab17929"><view class="{{['num', 'data-v-0ab17929', c && 'active']}}">03<view class="text data-v-0ab17929">认证成功</view></view></view></view></view><view class="line data-v-0ab17929"></view><view class="padding data-v-0ab17929"><view class="step1 data-v-0ab17929"><view class="h1 data-v-0ab17929">请选择您的房屋地址</view><view class="lab data-v-0ab17929">房屋信息</view><view class="row flex-b data-v-0ab17929"><view class="lable data-v-0ab17929">详细地址</view><view class="flex data-v-0ab17929" bindtap="{{e}}"><view class="adrs data-v-0ab17929">请选择</view><u-icon wx:if="{{d}}" class="data-v-0ab17929" u-i="0ab17929-0" bind:__l="__l" u-p="{{d}}"></u-icon></view></view><view class="btnBox data-v-0ab17929"><one-btn wx:if="{{f}}" class="data-v-0ab17929" u-i="0ab17929-1" bind:__l="__l" u-p="{{f}}"></one-btn></view></view></view></view>
\ No newline at end of file
+<view class="content data-v-0ab17929"><view class="stepTop data-v-0ab17929"><view class="steps flex-b data-v-0ab17929"><view class="proress data-v-0ab17929" style="{{'width:' + a}}"></view><view class="step data-v-0ab17929"><view class="num active data-v-0ab17929">01<view class="text data-v-0ab17929">房屋信息1</view></view></view><view class="step data-v-0ab17929"><view class="{{['num', 'data-v-0ab17929', b && 'active']}}">02<view class="text data-v-0ab17929">个人资料</view></view></view><view class="step data-v-0ab17929"><view class="{{['num', 'data-v-0ab17929', c && 'active']}}">03<view class="text data-v-0ab17929">认证成功</view></view></view></view></view><view class="line data-v-0ab17929"></view><view class="padding data-v-0ab17929"><view wx:if="{{d}}" class="step1 data-v-0ab17929"><view class="h1 data-v-0ab17929">请选择您的房屋地址</view><view class="lab data-v-0ab17929">房屋信息</view><view class="row flex-b data-v-0ab17929"><view class="lable data-v-0ab17929">详细地址</view><view class="flex data-v-0ab17929" bindtap="{{h}}"><view wx:if="{{e}}" class="adrs data-v-0ab17929">{{f}}</view><view wx:else class="adrs data-v-0ab17929">请选择</view><u-icon wx:if="{{g}}" class="data-v-0ab17929" u-i="0ab17929-0" bind:__l="__l" u-p="{{g}}"></u-icon></view></view><view class="btnBox data-v-0ab17929"><one-btn wx:if="{{j}}" class="data-v-0ab17929" bindoneBtnClick="{{i}}" u-i="0ab17929-1" bind:__l="__l" u-p="{{j}}"></one-btn></view></view><view wx:if="{{k}}" class="step2 data-v-0ab17929"><view class="btnBox data-v-0ab17929"><one-btn wx:if="{{m}}" class="data-v-0ab17929" bindoneBtnClick="{{l}}" u-i="0ab17929-2" bind:__l="__l" u-p="{{m}}"></one-btn></view></view><view wx:if="{{n}}" class="step3 data-v-0ab17929"><view class="okIcon data-v-0ab17929"><image class="data-v-0ab17929" src="{{o}}" mode=""></image></view><view class="oktext data-v-0ab17929">认证成功</view><view class="btnBox data-v-0ab17929"><one-btn wx:if="{{q}}" class="data-v-0ab17929" bindoneBtnClick="{{p}}" u-i="0ab17929-3" bind:__l="__l" u-p="{{q}}"></one-btn></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.wxss b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.wxss
index 071a682..557e04e 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/authentication.wxss
@@ -23,6 +23,14 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+image.data-v-0ab17929 {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+.content .btnBox.data-v-0ab17929 {
+  margin-top: 60rpx;
+}
 .content .line.data-v-0ab17929 {
   width: 100%;
   height: 20rpx;
@@ -44,8 +52,24 @@
   color: #DE3A26;
   margin-right: 6rpx;
 }
-.content .step1 .btnBox.data-v-0ab17929 {
-  margin-top: 60rpx;
+.content .step3.data-v-0ab17929 {
+  padding: 40rpx 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.content .step3 .okIcon.data-v-0ab17929 {
+  width: 303rpx;
+  height: 164rpx;
+}
+.content .step3 .oktext.data-v-0ab17929 {
+  font-size: 36rpx;
+  color: #343434;
+  margin-top: 20rpx;
+}
+.content .step3 .btnBox.data-v-0ab17929 {
+  width: 100%;
 }
 .content .stepTop.data-v-0ab17929 {
   padding: 20rpx 20rpx 50rpx 20rpx;
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.js b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.js
index 2a4a2e6..15bfd88 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.js
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.js
@@ -1,37 +1,158 @@
 "use strict";
 const common_vendor = require("../../../../common/vendor.js");
-const common_assets = require("../../../../common/assets.js");
+const config_api = require("../../../../config/api.js");
+const store_index = require("../../../../store/index.js");
+require("../../../../uni_modules/uview-plus/index.js");
+require("../../../../uni_modules/uview-plus/libs/mixin/mixin.js");
+require("../../../../uni_modules/uview-plus/libs/vue.js");
+require("../../../../uni_modules/uview-plus/libs/function/index.js");
+require("../../../../uni_modules/uview-plus/libs/function/test.js");
+require("../../../../uni_modules/uview-plus/libs/function/digit.js");
+require("../../../../uni_modules/uview-plus/libs/config/config.js");
+require("../../../../uni_modules/uview-plus/libs/util/route.js");
+require("../../../../uni_modules/uview-plus/libs/mixin/mpMixin.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/Request.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/dispatchRequest.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/adapters/index.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/helpers/buildURL.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/utils.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/buildFullPath.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/helpers/combineURLs.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/settle.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/InterceptorManager.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/mergeConfig.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/defaults.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/utils/clone.js");
+require("../../../../uni_modules/uview-plus/libs/function/colorGradient.js");
+require("../../../../uni_modules/uview-plus/libs/function/debounce.js");
+require("../../../../uni_modules/uview-plus/libs/function/throttle.js");
+require("../../../../uni_modules/uview-plus/libs/config/props.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/actionSheet.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/album.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/alert.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/avatar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/avatarGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/backtop.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/badge.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/button.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/calendar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/carKeyboard.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/cell.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/cellGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/checkbox.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/checkboxGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/circleProgress.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/code.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/codeInput.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/col.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/collapse.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/collapseItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/columnNotice.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/countDown.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/countTo.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/datetimePicker.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/divider.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/empty.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/form.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/formItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/gap.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/grid.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/gridItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/icon.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/image.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/indexAnchor.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/indexList.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/input.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/keyboard.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/line.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/lineProgress.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/link.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/list.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/listItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/loadingIcon.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/loadingPage.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/loadmore.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/modal.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/navbar.js");
+require("../../../../uni_modules/uview-plus/libs/config/color.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/noNetwork.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/noticeBar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/notify.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/numberBox.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/numberKeyboard.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/overlay.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/parse.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/picker.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/popup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/radio.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/radioGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/rate.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/readMore.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/row.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/rowNotice.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/scrollList.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/search.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/section.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/skeleton.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/slider.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/statusBar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/steps.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/stepsItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/sticky.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/subsection.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swipeAction.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swipeActionItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swiper.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swipterIndicator.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/switch.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tabbar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tabbarItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tabs.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tag.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/text.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/textarea.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/toast.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/toolbar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tooltip.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/transition.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/upload.js");
+require("../../../../uni_modules/uview-plus/libs/config/zIndex.js");
+require("../../../../uni_modules/uview-plus/libs/function/platform.js");
 const _sfc_main = {
-  data() {
-    return {};
-  },
-  methods: {
-    chooseItem(item) {
-      this.$goPage("/pages/subPage/authentication/comp/select2");
+  __name: "select1",
+  setup(__props) {
+    const counterStore = store_index.userStore();
+    let houseList = common_vendor.ref([]);
+    async function houseTreeFn() {
+      console.log("没有请求吗、");
+      const { data: res } = await config_api.houseTree();
+      res.forEach((item) => {
+        houseList.value.push(item.root);
+      });
+      console.log(res);
+      console.log(houseList.value);
     }
-  }
-};
-if (!Array) {
-  const _easycom_searchRow2 = common_vendor.resolveComponent("searchRow");
-  _easycom_searchRow2();
-}
-const _easycom_searchRow = () => "../../../../components/searchRow/searchRow.js";
-if (!Math) {
-  _easycom_searchRow();
-}
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
-    a: common_vendor.p({
-      placeholder: "请输入小区名称"
-    }),
-    b: common_assets._imports_0$3,
-    c: common_vendor.f(3, (item, index, i0) => {
+    function chooseItem(item) {
+      counterStore.upDateHouse("communityId", item.communityId);
+      counterStore.upDateHouse("communityName", item.communityName);
+      common_vendor.index.navigateTo({
+        url: "/pages/subPage/authentication/comp/select2"
+      });
+    }
+    houseTreeFn();
+    return (_ctx, _cache) => {
       return {
-        a: index,
-        b: common_vendor.o(($event) => $options.chooseItem(item), index)
+        a: common_vendor.f(common_vendor.unref(houseList), (item, index, i0) => {
+          return {
+            a: common_vendor.t(item.communityName),
+            b: index,
+            c: common_vendor.o(($event) => chooseItem(item), index)
+          };
+        })
       };
-    })
-  };
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-16c8851c"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/authentication/comp/select1.vue"]]);
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-16c8851c"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/authentication/comp/select1.vue"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.json b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.json
index 4a5edef..814a9ef 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.json
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.json
@@ -2,7 +2,5 @@
   "navigationBarTitleText": "业主认证",
   "enablePullDownRefresh": false,
   "backgroundTextStyle": "dark",
-  "usingComponents": {
-    "search-row": "../../../../components/searchRow/searchRow"
-  }
+  "usingComponents": {}
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.wxml
index 7c675b8..2427f51 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select1.wxml
@@ -1 +1 @@
-<view class="content padding data-v-16c8851c"><view class="tit data-v-16c8851c">选择小区</view><view class="searchBox data-v-16c8851c"><search-row wx:if="{{a}}" class="data-v-16c8851c" u-i="16c8851c-0" bind:__l="__l" u-p="{{a}}"/></view><view class="poz flex-b data-v-16c8851c"><view class="lab data-v-16c8851c">当前定位城市</view><view class="flex data-v-16c8851c"><view class="icon data-v-16c8851c"><image class="data-v-16c8851c" src="{{b}}" mode=""></image></view><view class="city data-v-16c8851c">杭州市</view></view></view><view class="huicity data-v-16c8851c">杭州市</view><view class="ul data-v-16c8851c"><view wx:for="{{c}}" wx:for-item="item" wx:key="a" class="li data-v-16c8851c" bindtap="{{item.b}}">小区名称</view></view></view>
\ No newline at end of file
+<view class="content padding data-v-16c8851c"><view class="tit data-v-16c8851c">选择小区</view><view class="ul data-v-16c8851c"><view wx:for="{{a}}" wx:for-item="item" wx:key="b" class="li data-v-16c8851c" bindtap="{{item.c}}">{{item.a}}</view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.js b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.js
index a9a224a..b998559 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.js
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.js
@@ -1,35 +1,156 @@
 "use strict";
 const common_vendor = require("../../../../common/vendor.js");
+const config_api = require("../../../../config/api.js");
+const store_index = require("../../../../store/index.js");
+require("../../../../uni_modules/uview-plus/index.js");
+require("../../../../uni_modules/uview-plus/libs/mixin/mixin.js");
+require("../../../../uni_modules/uview-plus/libs/vue.js");
+require("../../../../uni_modules/uview-plus/libs/function/index.js");
+require("../../../../uni_modules/uview-plus/libs/function/test.js");
+require("../../../../uni_modules/uview-plus/libs/function/digit.js");
+require("../../../../uni_modules/uview-plus/libs/config/config.js");
+require("../../../../uni_modules/uview-plus/libs/util/route.js");
+require("../../../../uni_modules/uview-plus/libs/mixin/mpMixin.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/Request.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/dispatchRequest.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/adapters/index.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/helpers/buildURL.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/utils.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/buildFullPath.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/helpers/combineURLs.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/settle.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/InterceptorManager.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/mergeConfig.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/defaults.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/utils/clone.js");
+require("../../../../uni_modules/uview-plus/libs/function/colorGradient.js");
+require("../../../../uni_modules/uview-plus/libs/function/debounce.js");
+require("../../../../uni_modules/uview-plus/libs/function/throttle.js");
+require("../../../../uni_modules/uview-plus/libs/config/props.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/actionSheet.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/album.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/alert.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/avatar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/avatarGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/backtop.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/badge.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/button.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/calendar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/carKeyboard.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/cell.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/cellGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/checkbox.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/checkboxGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/circleProgress.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/code.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/codeInput.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/col.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/collapse.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/collapseItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/columnNotice.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/countDown.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/countTo.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/datetimePicker.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/divider.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/empty.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/form.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/formItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/gap.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/grid.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/gridItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/icon.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/image.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/indexAnchor.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/indexList.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/input.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/keyboard.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/line.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/lineProgress.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/link.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/list.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/listItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/loadingIcon.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/loadingPage.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/loadmore.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/modal.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/navbar.js");
+require("../../../../uni_modules/uview-plus/libs/config/color.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/noNetwork.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/noticeBar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/notify.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/numberBox.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/numberKeyboard.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/overlay.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/parse.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/picker.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/popup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/radio.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/radioGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/rate.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/readMore.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/row.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/rowNotice.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/scrollList.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/search.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/section.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/skeleton.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/slider.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/statusBar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/steps.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/stepsItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/sticky.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/subsection.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swipeAction.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swipeActionItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swiper.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swipterIndicator.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/switch.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tabbar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tabbarItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tabs.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tag.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/text.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/textarea.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/toast.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/toolbar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tooltip.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/transition.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/upload.js");
+require("../../../../uni_modules/uview-plus/libs/config/zIndex.js");
+require("../../../../uni_modules/uview-plus/libs/function/platform.js");
 const _sfc_main = {
-  data() {
-    return {};
-  },
-  methods: {
-    chooseItem(item) {
-      this.$goPage("/pages/subPage/authentication/comp/select3");
+  __name: "select2",
+  setup(__props) {
+    const counterStore = store_index.userStore();
+    let houseList = common_vendor.ref([]);
+    async function houseTreeFn() {
+      console.log("没有请求吗、");
+      const { data: res } = await config_api.houseTree();
+      houseList.value = res[0].houseTypeNode;
+      console.log(res);
+      console.log(houseList.value);
     }
-  }
-};
-if (!Array) {
-  const _easycom_searchRow2 = common_vendor.resolveComponent("searchRow");
-  _easycom_searchRow2();
-}
-const _easycom_searchRow = () => "../../../../components/searchRow/searchRow.js";
-if (!Math) {
-  _easycom_searchRow();
-}
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
-    a: common_vendor.p({
-      placeholder: "请输入房屋类型"
-    }),
-    b: common_vendor.f(3, (item, index, i0) => {
+    function chooseItem(item) {
+      counterStore.upDateHouse("houseType", item.houseTypeId);
+      counterStore.upDateHouse("houseTypeName", item.houseTypeName);
+      common_vendor.index.navigateTo({
+        url: "/pages/subPage/authentication/comp/select3"
+      });
+    }
+    houseTreeFn();
+    return (_ctx, _cache) => {
       return {
-        a: index,
-        b: common_vendor.o(($event) => $options.chooseItem(item), index)
+        a: common_vendor.f(common_vendor.unref(houseList), (item, index, i0) => {
+          return {
+            a: common_vendor.t(item.houseTypeName),
+            b: index,
+            c: common_vendor.o(($event) => chooseItem(item), index)
+          };
+        })
       };
-    })
-  };
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-ff462848"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/authentication/comp/select2.vue"]]);
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-ff462848"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/authentication/comp/select2.vue"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.json b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.json
index 4a5edef..814a9ef 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.json
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.json
@@ -2,7 +2,5 @@
   "navigationBarTitleText": "业主认证",
   "enablePullDownRefresh": false,
   "backgroundTextStyle": "dark",
-  "usingComponents": {
-    "search-row": "../../../../components/searchRow/searchRow"
-  }
+  "usingComponents": {}
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.wxml
index 9cc2282..0792675 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select2.wxml
@@ -1 +1 @@
-<view class="content padding data-v-ff462848"><view class="tit data-v-ff462848">选择房屋类型</view><view class="searchBox data-v-ff462848"><search-row wx:if="{{a}}" class="data-v-ff462848" u-i="ff462848-0" bind:__l="__l" u-p="{{a}}"/></view><view class="ul data-v-ff462848"><view wx:for="{{b}}" wx:for-item="item" wx:key="a" class="li data-v-ff462848" bindtap="{{item.b}}">一期住宅</view></view></view>
\ No newline at end of file
+<view class="content padding data-v-ff462848"><view class="tit data-v-ff462848">选择房屋类型</view><view class="ul data-v-ff462848"><view wx:for="{{a}}" wx:for-item="item" wx:key="b" class="li data-v-ff462848" bindtap="{{item.c}}">{{item.a}}</view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select3.js b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select3.js
index f2adcef..9400eac 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select3.js
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select3.js
@@ -1,15 +1,124 @@
 "use strict";
 const common_vendor = require("../../../../common/vendor.js");
-const _sfc_main = {
-  data() {
-    return {};
-  },
-  methods: {
-    chooseItem(item) {
-      this.$goPage("/pages/subPage/authentication/authentication");
-    }
-  }
-};
+const config_api = require("../../../../config/api.js");
+const store_index = require("../../../../store/index.js");
+require("../../../../uni_modules/uview-plus/index.js");
+require("../../../../uni_modules/uview-plus/libs/mixin/mixin.js");
+require("../../../../uni_modules/uview-plus/libs/vue.js");
+require("../../../../uni_modules/uview-plus/libs/function/index.js");
+require("../../../../uni_modules/uview-plus/libs/function/test.js");
+require("../../../../uni_modules/uview-plus/libs/function/digit.js");
+require("../../../../uni_modules/uview-plus/libs/config/config.js");
+require("../../../../uni_modules/uview-plus/libs/util/route.js");
+require("../../../../uni_modules/uview-plus/libs/mixin/mpMixin.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/Request.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/dispatchRequest.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/adapters/index.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/helpers/buildURL.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/utils.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/buildFullPath.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/helpers/combineURLs.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/settle.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/InterceptorManager.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/mergeConfig.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/core/defaults.js");
+require("../../../../uni_modules/uview-plus/libs/luch-request/utils/clone.js");
+require("../../../../uni_modules/uview-plus/libs/function/colorGradient.js");
+require("../../../../uni_modules/uview-plus/libs/function/debounce.js");
+require("../../../../uni_modules/uview-plus/libs/function/throttle.js");
+require("../../../../uni_modules/uview-plus/libs/config/props.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/actionSheet.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/album.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/alert.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/avatar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/avatarGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/backtop.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/badge.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/button.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/calendar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/carKeyboard.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/cell.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/cellGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/checkbox.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/checkboxGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/circleProgress.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/code.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/codeInput.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/col.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/collapse.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/collapseItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/columnNotice.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/countDown.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/countTo.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/datetimePicker.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/divider.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/empty.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/form.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/formItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/gap.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/grid.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/gridItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/icon.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/image.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/indexAnchor.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/indexList.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/input.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/keyboard.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/line.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/lineProgress.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/link.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/list.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/listItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/loadingIcon.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/loadingPage.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/loadmore.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/modal.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/navbar.js");
+require("../../../../uni_modules/uview-plus/libs/config/color.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/noNetwork.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/noticeBar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/notify.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/numberBox.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/numberKeyboard.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/overlay.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/parse.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/picker.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/popup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/radio.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/radioGroup.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/rate.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/readMore.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/row.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/rowNotice.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/scrollList.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/search.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/section.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/skeleton.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/slider.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/statusBar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/steps.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/stepsItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/sticky.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/subsection.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swipeAction.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swipeActionItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swiper.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/swipterIndicator.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/switch.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tabbar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tabbarItem.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tabs.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tag.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/text.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/textarea.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/toast.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/toolbar.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/tooltip.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/transition.js");
+require("../../../../uni_modules/uview-plus/libs/config/props/upload.js");
+require("../../../../uni_modules/uview-plus/libs/config/zIndex.js");
+require("../../../../uni_modules/uview-plus/libs/function/platform.js");
 if (!Array) {
   const _easycom_searchRow2 = common_vendor.resolveComponent("searchRow");
   _easycom_searchRow2();
@@ -18,18 +127,51 @@ const _easycom_searchRow = () => "../../../../components/searchRow/searchRow.js"
 if (!Math) {
   _easycom_searchRow();
 }
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
-    a: common_vendor.p({
-      placeholder: "请输入您的房号"
-    }),
-    b: common_vendor.f(3, (item, index, i0) => {
+const _sfc_main = {
+  __name: "select3",
+  setup(__props) {
+    const counterStore = store_index.userStore();
+    let houseList = common_vendor.ref([]);
+    async function houseTreeFn(roomNum = "") {
+      let obj = {
+        "roomNum": roomNum,
+        "houseType": counterStore.chooseHouse.houseType,
+        "communityId": counterStore.chooseHouse.communityId
+      };
+      const { data: res } = await config_api.houseRoom(obj);
+      if (!res)
+        return houseList.value = [];
+      houseList.value = res;
+      console.log(res);
+      console.log(houseList.value);
+    }
+    function chooseItem(item) {
+      counterStore.upDateHouse("roomNum", item.roomNumDesc);
+      counterStore.upDateHouse("houseId", item.houseId);
+      common_vendor.index.navigateTo({
+        url: "/pages/subPage/authentication/authentication"
+      });
+    }
+    function searchFn(val) {
+      houseTreeFn(val);
+    }
+    houseTreeFn();
+    return (_ctx, _cache) => {
       return {
-        a: index,
-        b: common_vendor.o(($event) => $options.chooseItem(item), index)
+        a: common_vendor.o(searchFn),
+        b: common_vendor.p({
+          placeholder: "请输入您的房号"
+        }),
+        c: common_vendor.f(common_vendor.unref(houseList), (item, index, i0) => {
+          return {
+            a: common_vendor.t(item.roomNumDesc),
+            b: index,
+            c: common_vendor.o(($event) => chooseItem(item), index)
+          };
+        })
       };
-    })
-  };
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-31a868f6"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/authentication/comp/select3.vue"]]);
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-31a868f6"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/authentication/comp/select3.vue"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select3.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select3.wxml
index 4f858e3..ac4dd65 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select3.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/authentication/comp/select3.wxml
@@ -1 +1 @@
-<view class="content padding data-v-31a868f6"><view class="tit data-v-31a868f6">选择房屋房号</view><view class="searchBox data-v-31a868f6"><search-row wx:if="{{a}}" class="data-v-31a868f6" u-i="31a868f6-0" bind:__l="__l" u-p="{{a}}"/></view><view class="ul data-v-31a868f6"><view wx:for="{{b}}" wx:for-item="item" wx:key="a" class="li data-v-31a868f6" bindtap="{{item.b}}">1-1-101</view></view></view>
\ No newline at end of file
+<view class="content padding data-v-31a868f6"><view class="tit data-v-31a868f6">选择房屋房号</view><view class="searchBox data-v-31a868f6"><search-row wx:if="{{b}}" class="data-v-31a868f6" bindsearchFn="{{a}}" u-i="31a868f6-0" bind:__l="__l" u-p="{{b}}"/></view><view class="ul data-v-31a868f6"><view wx:for="{{c}}" wx:for-item="item" wx:key="b" class="li data-v-31a868f6" bindtap="{{item.c}}">{{item.a}}</view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.js b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.js
new file mode 100644
index 0000000..c980a7f
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.js
@@ -0,0 +1,59 @@
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+const common_assets = require("../../../../common/assets.js");
+if (!Array) {
+  const _easycom_up_tabs2 = common_vendor.resolveComponent("up-tabs");
+  _easycom_up_tabs2();
+}
+const _easycom_up_tabs = () => "../../../../uni_modules/uview-plus/components/u-tabs/u-tabs.js";
+if (!Math) {
+  _easycom_up_tabs();
+}
+const _sfc_main = {
+  __name: "ballotsList",
+  setup(__props) {
+    const tabArr = common_vendor.reactive([
+      { name: "投票列表", id: 1 },
+      { name: "我的投票", id: 2 }
+    ]);
+    const tagArr = common_vendor.reactive([
+      { name: "全部", id: 1 },
+      { name: "进行中", id: 2 },
+      { name: "已结束", id: 3 }
+    ]);
+    function tabClick(item) {
+      console.log("item", item);
+    }
+    let currentTag = common_vendor.ref(1);
+    function tagClick(item) {
+      currentTag.value = item.id;
+    }
+    function goVote(item) {
+      console.log(item);
+      common_vendor.index.navigateTo({
+        url: "/pages/subPage/ballots/vote/vote"
+      });
+    }
+    return (_ctx, _cache) => {
+      return {
+        a: common_assets._imports_0$3,
+        b: common_vendor.o(tabClick),
+        c: common_vendor.p({
+          list: tabArr,
+          lineColor: "#DE3A26"
+        }),
+        d: common_vendor.f(tagArr, (item, index, i0) => {
+          return {
+            a: common_vendor.t(item.name),
+            b: index,
+            c: common_vendor.unref(currentTag) == item.id ? 1 : "",
+            d: common_vendor.o(($event) => tagClick(item), index)
+          };
+        }),
+        e: common_vendor.o(($event) => goVote(_ctx.item))
+      };
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-747012e4"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/ballots/ballotsList/ballotsList.vue"]]);
+wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.json b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.json
new file mode 100644
index 0000000..751cda8
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.json
@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "投票表决",
+  "enablePullDownRefresh": false,
+  "backgroundTextStyle": "dark",
+  "usingComponents": {
+    "up-tabs": "../../../../uni_modules/uview-plus/components/u-tabs/u-tabs"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxml
new file mode 100644
index 0000000..93057f0
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxml
@@ -0,0 +1 @@
+<view class="content padding data-v-747012e4"><view class="banner data-v-747012e4"><image class="data-v-747012e4" src="{{a}}" mode=""></image></view><view class="tabs data-v-747012e4"><up-tabs wx:if="{{c}}" class="data-v-747012e4" bindclick="{{b}}" u-i="747012e4-0" bind:__l="__l" u-p="{{c}}"></up-tabs></view><view class="tags data-v-747012e4"><view wx:for="{{d}}" wx:for-item="item" wx:key="b" class="{{['tag', 'data-v-747012e4', item.c && 'active']}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="ul data-v-747012e4"><view class="li data-v-747012e4"><view class="flex-b data-v-747012e4"><view class="name towRowText data-v-747012e4">说要两行显示说要两行显示说要两行显示说要两行显示说要两行显示说要两行显示说要两行显示</view><view class="btn data-v-747012e4" bindtap="{{e}}">我要投票</view></view><view class="text data-v-747012e4"><text class="data-v-747012e4">发起人：张三</text><text class="data-v-747012e4">截止时间：2024-04-01 19:30</text></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxss b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxss
new file mode 100644
index 0000000..99dbbf7
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxss
@@ -0,0 +1,104 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+image.data-v-747012e4 {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+.content .banner.data-v-747012e4 {
+  width: 100%;
+  height: 174rpx;
+}
+.content .tabs.data-v-747012e4 {
+  padding: 30rpx 0 10rpx 0;
+  border-bottom: 1px solid #EFEFEF;
+}
+.content .tags.data-v-747012e4 {
+  width: 100%;
+  height: 110rpx;
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #EFEFEF;
+}
+.content .tags .tag.data-v-747012e4 {
+  height: 50rpx;
+  background: #EFEFEF;
+  border-radius: 25rpx;
+  border: 1px solid #F4F4F4;
+  line-height: 50rpx;
+  padding: 0 14rpx;
+  font-size: 24rpx;
+  margin-right: 30rpx;
+}
+.content .tags .tag.active.data-v-747012e4 {
+  color: #DE3A26;
+  background: rgba(222, 58, 38, 0.1);
+  border-radius: 25rpx;
+  border: 1px solid #DE3A26;
+}
+.content .ul.data-v-747012e4 {
+  width: 100%;
+}
+.content .ul .li.data-v-747012e4 {
+  width: 100%;
+  padding: 30rpx 0;
+  border-bottom: 1px solid #EFEFEF;
+}
+.content .ul .li.data-v-747012e4:last-child {
+  border: none;
+}
+.content .ul .li .flex-b .name.data-v-747012e4 {
+  font-size: 32rpx;
+  color: #333333;
+  flex: 1;
+  width: 0;
+  padding-right: 30rpx;
+}
+.content .ul .li .flex-b .btn.data-v-747012e4 {
+  width: 132rpx;
+  height: 44rpx;
+  background: #DE3A26;
+  border-radius: 22rpx;
+  font-size: 24rpx;
+  color: #fff;
+  text-align: center;
+  line-height: 44rpx;
+}
+.content .ul .li .flex-b .btn.boder.data-v-747012e4 {
+  border: 1px solid #DE3A26;
+  color: #DE3A26;
+}
+.content .ul .li .flex-b .btn.hui.data-v-747012e4 {
+  opacity: 0.4;
+}
+.content .ul .li .text.data-v-747012e4 {
+  padding-top: 14rpx;
+}
+.content .ul .li .text text.data-v-747012e4 {
+  font-size: 24rpx;
+  color: #9C9C9C;
+  margin-right: 40rpx;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.js b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.js
new file mode 100644
index 0000000..ffee326
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.js
@@ -0,0 +1,8 @@
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+const _sfc_main = {};
+function _sfc_render(_ctx, _cache) {
+  return {};
+}
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/ballots/vote/vote.vue"]]);
+wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.json b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.json
new file mode 100644
index 0000000..d3c63ac
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.json
@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "投票表决",
+  "enablePullDownRefresh": false,
+  "backgroundTextStyle": "dark",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxml
new file mode 100644
index 0000000..3884663
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxml
@@ -0,0 +1 @@
+<view class="content"> 66 </view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxss b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.js b/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.js
index 8d033eb..c357c24 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.js
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.js
@@ -1,14 +1,13 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
+const common_assets = require("../../../common/assets.js");
 const config_api = require("../../../config/api.js");
 require("../../../uni_modules/uview-plus/index.js");
-const common_assets = require("../../../common/assets.js");
+const store_index = require("../../../store/index.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../../uni_modules/uview-plus/libs/function/index.js");
 require("../../../uni_modules/uview-plus/libs/mixin/mixin.js");
 require("../../../uni_modules/uview-plus/libs/vue.js");
-require("../../../uni_modules/uview-plus/libs/function/index.js");
 require("../../../uni_modules/uview-plus/libs/function/test.js");
-require("../../../uni_modules/uview-plus/libs/function/digit.js");
-require("../../../uni_modules/uview-plus/libs/config/config.js");
 require("../../../uni_modules/uview-plus/libs/util/route.js");
 require("../../../uni_modules/uview-plus/libs/mixin/mpMixin.js");
 require("../../../uni_modules/uview-plus/libs/luch-request/core/Request.js");
@@ -27,6 +26,7 @@ require("../../../uni_modules/uview-plus/libs/luch-request/utils/clone.js");
 require("../../../uni_modules/uview-plus/libs/function/colorGradient.js");
 require("../../../uni_modules/uview-plus/libs/function/debounce.js");
 require("../../../uni_modules/uview-plus/libs/function/throttle.js");
+require("../../../uni_modules/uview-plus/libs/config/config.js");
 require("../../../uni_modules/uview-plus/libs/config/props.js");
 require("../../../uni_modules/uview-plus/libs/config/props/actionSheet.js");
 require("../../../uni_modules/uview-plus/libs/config/props/album.js");
@@ -119,46 +119,32 @@ require("../../../uni_modules/uview-plus/libs/config/props/transition.js");
 require("../../../uni_modules/uview-plus/libs/config/props/upload.js");
 require("../../../uni_modules/uview-plus/libs/config/zIndex.js");
 require("../../../uni_modules/uview-plus/libs/function/platform.js");
+require("../../../uni_modules/uview-plus/libs/function/digit.js");
+if (!Array) {
+  const _easycom_oneBtn2 = common_vendor.resolveComponent("oneBtn");
+  _easycom_oneBtn2();
+}
+const _easycom_oneBtn = () => "../../../components/oneBtn/oneBtn.js";
+if (!Math) {
+  (_easycom_oneBtn + privacyRadion)();
+}
+const privacyRadion = () => "../../../components/privacyRadion/privacyRadion.js";
 const _sfc_main = {
-  data() {
-    return {
-      FormData: {
-        phone: "",
-        code: ""
-      },
-      isCheck: false
-    };
-  },
-  methods: {
-    handleBtnClick() {
-      this.$u.toast("请先勾先勾选用户协议与隐私政策");
-    },
-    // 是否选择协议
-    changeRadio(val) {
+  __name: "login",
+  setup(__props) {
+    common_vendor.ref({
+      phone: "",
+      code: ""
+    });
+    let isCheck = common_vendor.ref(false);
+    function handleBtnClick() {
+      uni_modules_uviewPlus_libs_function_index.toast("请先勾先勾选用户协议与隐私政策");
+    }
+    function changeRadio(val) {
       common_vendor.index.hideKeyboard();
-      this.isCheck = val;
-    },
-    async getPhoneNumber(e) {
-      if (!this.isCheck)
-        return this.$u.toast("请勾选产品协议与隐私政策");
-      let phoneCode = e.detail.code;
-      console.log("来到这里了吗？");
-      console.log(phoneCode);
-      console.log(e.detail.errMsg);
-      console.log(e.detail);
-      const loginCode = await this.loginFn();
-      if (!loginCode || !phoneCode)
-        return;
-      console.log("登录验证码");
-      console.log(loginCode);
-      let obj = {
-        phoneCode,
-        socialCode: loginCode
-      };
-      const { data: res } = await config_api.weixinLogin(obj);
-      console.log(res);
-    },
-    loginFn() {
+      isCheck.value = val;
+    }
+    function loginFn() {
       return new Promise((resolve, reject) => {
         common_vendor.index.login({
           provider: "weixin",
@@ -178,38 +164,59 @@ const _sfc_main = {
         });
       });
     }
+    async function getPhoneNumber(e) {
+      if (!isCheck.value)
+        return uni_modules_uviewPlus_libs_function_index.toast("请勾选产品协议与隐私政策");
+      let phoneCode = e.detail.code;
+      console.log("来到这里了吗？");
+      console.log(phoneCode);
+      console.log(e.detail.errMsg);
+      console.log(e.detail);
+      const loginCode = await loginFn();
+      if (!loginCode || !phoneCode)
+        return;
+      console.log("登录验证码");
+      console.log(loginCode);
+      let obj = {
+        phoneCode,
+        socialCode: loginCode
+      };
+      const {
+        data: res
+      } = await config_api.weixinLogin(obj);
+      console.log(res);
+      const counterStore = store_index.userStore();
+      console.log("什么都没有？");
+      console.log(counterStore);
+      console.log(counterStore.upDateLoginInfo);
+      counterStore.upDateLoginInfo(res);
+      counterStore.upDateToken(res.accessToken);
+      common_vendor.index.switchTab({
+        url: "/pages/tabbar/index/index"
+      });
+    }
+    return (_ctx, _cache) => {
+      return common_vendor.e({
+        a: common_assets._imports_0$1,
+        b: !common_vendor.unref(isCheck)
+      }, !common_vendor.unref(isCheck) ? {
+        c: common_vendor.o(handleBtnClick),
+        d: common_vendor.p({
+          text: "微信一键登录"
+        })
+      } : {
+        e: common_vendor.o(getPhoneNumber),
+        f: common_vendor.p({
+          text: "微信一键登录0"
+        })
+      }, {
+        g: common_vendor.o(changeRadio),
+        h: common_vendor.p({
+          isCheck: common_vendor.unref(isCheck)
+        })
+      });
+    };
   }
 };
-if (!Array) {
-  const _easycom_oneBtn2 = common_vendor.resolveComponent("oneBtn");
-  const _easycom_privacyRadion2 = common_vendor.resolveComponent("privacyRadion");
-  (_easycom_oneBtn2 + _easycom_privacyRadion2)();
-}
-const _easycom_oneBtn = () => "../../../components/oneBtn/oneBtn.js";
-const _easycom_privacyRadion = () => "../../../components/privacyRadion/privacyRadion.js";
-if (!Math) {
-  (_easycom_oneBtn + _easycom_privacyRadion)();
-}
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return common_vendor.e({
-    a: common_assets._imports_0$2,
-    b: !$data.isCheck
-  }, !$data.isCheck ? {
-    c: common_vendor.o($options.handleBtnClick),
-    d: common_vendor.p({
-      text: "微信一键登录"
-    })
-  } : {
-    e: common_vendor.o((...args) => $options.getPhoneNumber && $options.getPhoneNumber(...args)),
-    f: common_vendor.p({
-      text: "微信一键登录"
-    })
-  }, {
-    g: common_vendor.o($options.changeRadio),
-    h: common_vendor.p({
-      isCheck: $data.isCheck
-    })
-  });
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f8b2b374"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/login/login.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-f8b2b374"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/login/login.vue"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.wxml
index ef64633..d8767d8 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.wxml
@@ -1 +1 @@
-<view class="content data-v-f8b2b374"><view class="padding data-v-f8b2b374"><view class="logoCon data-v-f8b2b374"><view class="logo data-v-f8b2b374"><image class="data-v-f8b2b374" src="{{a}}" mode=""></image></view><view class="name data-v-f8b2b374">事务通</view></view><view wx:if="{{b}}" class="oneBtnBox data-v-f8b2b374"><one-btn wx:if="{{d}}" class="data-v-f8b2b374" bindoneBtnClick="{{c}}" u-i="f8b2b374-0" bind:__l="__l" u-p="{{d}}"></one-btn></view><view wx:else class="oneBtnBox data-v-f8b2b374"><button type="default" open-type="getPhoneNumber" bindgetphonenumber="{{e}}" class="cotact data-v-f8b2b374">联系客服</button><one-btn wx:if="{{f}}" class="data-v-f8b2b374" u-i="f8b2b374-1" bind:__l="__l" u-p="{{f}}"></one-btn></view><view class="data-v-f8b2b374" style="padding-top:30rpx"><privacy-radion wx:if="{{h}}" class="data-v-f8b2b374" style="margin-top:40rpx" bindchangeRadio="{{g}}" u-i="f8b2b374-2" bind:__l="__l" u-p="{{h}}"/></view></view></view>
\ No newline at end of file
+<view class="content data-v-f8b2b374"><view class="padding data-v-f8b2b374"><view class="logoCon data-v-f8b2b374"><view class="logo data-v-f8b2b374"><image class="data-v-f8b2b374" src="{{a}}" mode=""></image></view><view class="name data-v-f8b2b374">事务通</view></view><view wx:if="{{b}}" class="oneBtnBox data-v-f8b2b374"><one-btn wx:if="{{d}}" class="data-v-f8b2b374" bindoneBtnClick="{{c}}" u-i="f8b2b374-0" bind:__l="__l" u-p="{{d}}"></one-btn></view><view wx:else class="oneBtnBox data-v-f8b2b374"><button open-type="getPhoneNumber" bindgetphonenumber="{{e}}" class="cotactzz data-v-f8b2b374">微信一键登录</button><one-btn wx:if="{{f}}" class="data-v-f8b2b374" u-i="f8b2b374-1" bind:__l="__l" u-p="{{f}}"></one-btn></view><view class="data-v-f8b2b374" style="padding-top:30rpx"><privacy-radion wx:if="{{h}}" class="data-v-f8b2b374" style="margin-top:40rpx" bindchangeRadio="{{g}}" u-i="f8b2b374-2" bind:__l="__l" u-p="{{h}}"/></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.wxss b/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.wxss
index cf71221..bd7a20d 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/login/login.wxss
@@ -90,7 +90,7 @@ image.data-v-f8b2b374 {
   margin-top: 40rpx;
   position: relative;
 }
-.content .oneBtnBox .cotact.data-v-f8b2b374 {
+.content .oneBtnBox .cotactzz.data-v-f8b2b374 {
   position: absolute;
   left: 0;
   right: 0;
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.json b/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.json
deleted file mode 100644
index 77d9eeb..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "navigationBarTitleText": "登录",
-  "enablePullDownRefresh": false,
-  "backgroundTextStyle": "dark",
-  "usingComponents": {
-    "one-btn": "../../../components/oneBtn/oneBtn",
-    "privacy-radion": "../../../components/privacyRadion/privacyRadion"
-  }
-}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxml
deleted file mode 100644
index 7a36f27..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxml
+++ /dev/null
@@ -1 +0,0 @@
-<view class="content data-v-c1df8796"><view class="padding data-v-c1df8796"><view class="logoCon data-v-c1df8796"><view class="logo data-v-c1df8796"><image class="data-v-c1df8796" src="{{a}}" mode=""></image></view><view class="name data-v-c1df8796">事务通</view></view><view wx:if="{{b}}" class="oneBtnBox data-v-c1df8796"><one-btn wx:if="{{d}}" class="data-v-c1df8796" bindoneBtnClick="{{c}}" u-i="c1df8796-0" bind:__l="__l" u-p="{{d}}"></one-btn></view><view wx:else class="oneBtnBox data-v-c1df8796"><button type="default" open-type="getPhoneNumber" bindgetphonenumber="{{e}}" class="cotact data-v-c1df8796">联系客服</button><one-btn wx:if="{{f}}" class="data-v-c1df8796" u-i="c1df8796-1" bind:__l="__l" u-p="{{f}}"></one-btn></view><privacy-radion wx:if="{{h}}" class="data-v-c1df8796" style="margin-top:40rpx" bindchangeRadio="{{g}}" u-i="c1df8796-2" bind:__l="__l" u-p="{{h}}"/></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxss b/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxss
deleted file mode 100644
index 1fdec92..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxss
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-image.data-v-c1df8796 {
-  display: block;
-  width: 100%;
-  height: 100%;
-}
-.other.data-v-c1df8796 {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: 22rpx;
-  color: #9C9C9C;
-  position: fixed;
-  bottom: 80rpx;
-  left: 0;
-  width: 100%;
-}
-.other .lineTxt.data-v-c1df8796 {
-  position: relative;
-}
-.other .lineTxt.data-v-c1df8796::before {
-  content: "";
-  position: absolute;
-  width: 240rpx;
-  height: 1rpx;
-  top: 50%;
-  background: #e6e6e6;
-  right: 150rpx;
-  transform: translateY(50%);
-  z-index: 99;
-}
-.other .lineTxt.data-v-c1df8796::after {
-  content: "";
-  position: absolute;
-  width: 240rpx;
-  height: 1rpx;
-  top: 50%;
-  background: #e6e6e6;
-  left: 150rpx;
-  transform: translateY(50%);
-  z-index: 99;
-}
-.other .icon.data-v-c1df8796 {
-  width: 80rpx;
-  height: 80rpx;
-  margin: 20rpx 0;
-}
-.content .logoCon.data-v-c1df8796 {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding-top: 150rpx;
-}
-.content .logoCon .logo.data-v-c1df8796 {
-  width: 160rpx;
-  height: 160rpx;
-}
-.content .logoCon .name.data-v-c1df8796 {
-  font-size: 32rpx;
-  margin-top: 20rpx;
-  font-weight: 700;
-}
-.content .oneBtnBox.data-v-c1df8796 {
-  margin-top: 40rpx;
-  position: relative;
-}
-.content .oneBtnBox .cotact.data-v-c1df8796 {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  opacity: 0;
-}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.js b/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.js
similarity index 77%
rename from unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.js
rename to unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.js
index 03fee82..5ac8f8e 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.js
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.js
@@ -2,7 +2,6 @@
 const common_vendor = require("../../../common/vendor.js");
 const config_api = require("../../../config/api.js");
 require("../../../uni_modules/uview-plus/index.js");
-const common_assets = require("../../../common/assets.js");
 require("../../../uni_modules/uview-plus/libs/mixin/mixin.js");
 require("../../../uni_modules/uview-plus/libs/vue.js");
 require("../../../uni_modules/uview-plus/libs/function/index.js");
@@ -122,94 +121,38 @@ require("../../../uni_modules/uview-plus/libs/function/platform.js");
 const _sfc_main = {
   data() {
     return {
-      FormData: {
-        phone: "",
-        code: ""
-      },
-      isCheck: false
+      type: 1,
+      url: ""
     };
   },
-  methods: {
-    handleBtnClick() {
-      this.$u.toast("请先勾先勾选用户协议与隐私政策");
-    },
-    // 是否选择协议
-    changeRadio(val) {
-      common_vendor.index.hideKeyboard();
-      this.isCheck = val;
-    },
-    async getPhoneNumber(e) {
-      if (!this.isCheck)
-        return this.$u.toast("请勾选产品协议与隐私政策");
-      let phoneCode = e.detail.code;
-      console.log("来到这里了吗？");
-      console.log(phoneCode);
-      console.log(e.detail.errMsg);
-      console.log(e.detail);
-      const loginCode = await this.loginFn();
-      if (!loginCode || !phoneCode)
-        return;
-      console.log("登录验证码");
-      console.log(loginCode);
-      let obj = {
-        phoneCode,
-        socialCode: loginCode
-      };
-      const { data: res } = await config_api.weixinLogin(obj);
-      console.log(res);
-    },
-    loginFn() {
-      return new Promise((resolve, reject) => {
-        common_vendor.index.login({
-          provider: "weixin",
-          success: (loginRes) => {
-            if (loginRes.code) {
-              console.log("loginRes.code");
-              console.log(loginRes.code);
-              resolve(loginRes.code);
-            } else {
-              console.error("微信登录失败");
-            }
-          },
-          fail: (err) => {
-            reject(null);
-            console.error("微信登录失败", err);
-          }
-        });
+  onLoad(options) {
+    this.type = options.type;
+    if (this.type == 1) {
+      common_vendor.index.setNavigationBarTitle({
+        title: "隐私政策"
+      });
+    } else {
+      common_vendor.index.setNavigationBarTitle({
+        title: "用户使用协议"
       });
     }
+    this.getAgreementFn();
+  },
+  methods: {
+    async getAgreementFn() {
+      const { data: res } = await config_api.getAgreement();
+      if (this.type == 1) {
+        this.url = res.privacyAgreementUrl;
+      } else {
+        this.url = res.useAgreementUrl;
+      }
+    }
   }
 };
-if (!Array) {
-  const _easycom_oneBtn2 = common_vendor.resolveComponent("oneBtn");
-  const _easycom_privacyRadion2 = common_vendor.resolveComponent("privacyRadion");
-  (_easycom_oneBtn2 + _easycom_privacyRadion2)();
-}
-const _easycom_oneBtn = () => "../../../components/oneBtn/oneBtn.js";
-const _easycom_privacyRadion = () => "../../../components/privacyRadion/privacyRadion.js";
-if (!Math) {
-  (_easycom_oneBtn + _easycom_privacyRadion)();
-}
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return common_vendor.e({
-    a: common_assets._imports_0$2,
-    b: !$data.isCheck
-  }, !$data.isCheck ? {
-    c: common_vendor.o($options.handleBtnClick),
-    d: common_vendor.p({
-      text: "微信一键登录"
-    })
-  } : {
-    e: common_vendor.o((...args) => $options.getPhoneNumber && $options.getPhoneNumber(...args)),
-    f: common_vendor.p({
-      text: "微信一键登录"
-    })
-  }, {
-    g: common_vendor.o($options.changeRadio),
-    h: common_vendor.p({
-      isCheck: $data.isCheck
-    })
-  });
+  return {
+    a: $data.url
+  };
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-c1df8796"], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/login/loginwx.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/work/xinjiangMiniProgram/pages/subPage/privacyAgreement/privacyAgreement.vue"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.json b/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.json
new file mode 100644
index 0000000..8481469
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.json
@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "用户协议",
+  "enablePullDownRefresh": false,
+  "backgroundTextStyle": "dark",
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxml
new file mode 100644
index 0000000..a1e61ef
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxml
@@ -0,0 +1 @@
+<view class="main"><web-view src="{{a}}"></web-view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxss b/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/unpackage/dist/dev/mp-weixin/pages/tabbar/index/comp/notice.js b/unpackage/dist/dev/mp-weixin/pages/tabbar/index/comp/notice.js
index 722b164..afa0078 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tabbar/index/comp/notice.js
+++ b/unpackage/dist/dev/mp-weixin/pages/tabbar/index/comp/notice.js
@@ -1,15 +1,17 @@
 "use strict";
 const common_vendor = require("../../../../common/vendor.js");
-const common_assets = require("../../../../common/assets.js");
-const _sfc_main = {};
-function _sfc_render(_ctx, _cache) {
+const _sfc_main = {
+  props: ["list"]
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
-    a: common_vendor.f(6, (item, index, i0) => {
+    a: common_vendor.f($props.list, (item, index, i0) => {
       return {
-        a: index
+        a: common_vendor.t(item.title),
+        b: item.picture,
+        c: index
       };
-    }),
-    b: common_assets._imports_0$1
+    })
   };
 }
 const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-95913b5f"], ["__file", "D:/work/xinjiangMiniProgram/pages/tabbar/index/comp/notice.vue"]]);
diff --git a/unpackage/dist/dev/mp-weixin/pages/tabbar/index/comp/notice.wxml b/unpackage/dist/dev/mp-weixin/pages/tabbar/index/comp/notice.wxml
index 3253e40..c87620c 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tabbar/index/comp/notice.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/tabbar/index/comp/notice.wxml
@@ -1 +1 @@
-<view class="ul data-v-95913b5f"><view wx:for="{{a}}" wx:for-item="item" wx:key="a" class="li flex-b data-v-95913b5f"><view class="leftTxt data-v-95913b5f"><view class="tit towRowText data-v-95913b5f"> 公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题公告标题 </view><view class="date data-v-95913b5f">2024.06.28 18:42</view></view><view class="cover data-v-95913b5f"><image class="data-v-95913b5f" src="{{b}}" mode=""></image></view></view></view>
\ No newline at end of file
+<view class="ul data-v-95913b5f"><view wx:for="{{a}}" wx:for-item="item" wx:key="c" class="li flex-b data-v-95913b5f"><view class="leftTxt data-v-95913b5f"><view class="tit towRowText data-v-95913b5f">{{item.a}}</view><view class="date data-v-95913b5f">2024.06.28 18:42</view></view><view class="cover data-v-95913b5f"><image class="data-v-95913b5f" src="{{item.b}}" mode=""></image></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.js b/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.js
index a3fe1cd..1816642 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.js
@@ -1,70 +1,225 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
 const common_assets = require("../../../common/assets.js");
-const notice = () => "./comp/notice.js";
-const _sfc_main = {
-  components: {
-    notice
-  },
-  data() {
-    return {
-      show: true
-    };
-  },
-  methods: {
-    authentication() {
-      this.show = false;
-      this.$goPage("/pages/subPage/authentication/authentication");
-    }
-  }
-};
+const config_site_config = require("../../../config/site.config.js");
+const store_index = require("../../../store/index.js");
+const config_api = require("../../../config/api.js");
+require("../../../uni_modules/uview-plus/index.js");
+require("../../../uni_modules/uview-plus/libs/mixin/mixin.js");
+require("../../../uni_modules/uview-plus/libs/vue.js");
+require("../../../uni_modules/uview-plus/libs/function/index.js");
+require("../../../uni_modules/uview-plus/libs/function/test.js");
+require("../../../uni_modules/uview-plus/libs/function/digit.js");
+require("../../../uni_modules/uview-plus/libs/config/config.js");
+require("../../../uni_modules/uview-plus/libs/util/route.js");
+require("../../../uni_modules/uview-plus/libs/mixin/mpMixin.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/Request.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/dispatchRequest.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/adapters/index.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/helpers/buildURL.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/utils.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/buildFullPath.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/helpers/combineURLs.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/settle.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/InterceptorManager.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/mergeConfig.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/core/defaults.js");
+require("../../../uni_modules/uview-plus/libs/luch-request/utils/clone.js");
+require("../../../uni_modules/uview-plus/libs/function/colorGradient.js");
+require("../../../uni_modules/uview-plus/libs/function/debounce.js");
+require("../../../uni_modules/uview-plus/libs/function/throttle.js");
+require("../../../uni_modules/uview-plus/libs/config/props.js");
+require("../../../uni_modules/uview-plus/libs/config/props/actionSheet.js");
+require("../../../uni_modules/uview-plus/libs/config/props/album.js");
+require("../../../uni_modules/uview-plus/libs/config/props/alert.js");
+require("../../../uni_modules/uview-plus/libs/config/props/avatar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/avatarGroup.js");
+require("../../../uni_modules/uview-plus/libs/config/props/backtop.js");
+require("../../../uni_modules/uview-plus/libs/config/props/badge.js");
+require("../../../uni_modules/uview-plus/libs/config/props/button.js");
+require("../../../uni_modules/uview-plus/libs/config/props/calendar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/carKeyboard.js");
+require("../../../uni_modules/uview-plus/libs/config/props/cell.js");
+require("../../../uni_modules/uview-plus/libs/config/props/cellGroup.js");
+require("../../../uni_modules/uview-plus/libs/config/props/checkbox.js");
+require("../../../uni_modules/uview-plus/libs/config/props/checkboxGroup.js");
+require("../../../uni_modules/uview-plus/libs/config/props/circleProgress.js");
+require("../../../uni_modules/uview-plus/libs/config/props/code.js");
+require("../../../uni_modules/uview-plus/libs/config/props/codeInput.js");
+require("../../../uni_modules/uview-plus/libs/config/props/col.js");
+require("../../../uni_modules/uview-plus/libs/config/props/collapse.js");
+require("../../../uni_modules/uview-plus/libs/config/props/collapseItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/columnNotice.js");
+require("../../../uni_modules/uview-plus/libs/config/props/countDown.js");
+require("../../../uni_modules/uview-plus/libs/config/props/countTo.js");
+require("../../../uni_modules/uview-plus/libs/config/props/datetimePicker.js");
+require("../../../uni_modules/uview-plus/libs/config/props/divider.js");
+require("../../../uni_modules/uview-plus/libs/config/props/empty.js");
+require("../../../uni_modules/uview-plus/libs/config/props/form.js");
+require("../../../uni_modules/uview-plus/libs/config/props/formItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/gap.js");
+require("../../../uni_modules/uview-plus/libs/config/props/grid.js");
+require("../../../uni_modules/uview-plus/libs/config/props/gridItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/icon.js");
+require("../../../uni_modules/uview-plus/libs/config/props/image.js");
+require("../../../uni_modules/uview-plus/libs/config/props/indexAnchor.js");
+require("../../../uni_modules/uview-plus/libs/config/props/indexList.js");
+require("../../../uni_modules/uview-plus/libs/config/props/input.js");
+require("../../../uni_modules/uview-plus/libs/config/props/keyboard.js");
+require("../../../uni_modules/uview-plus/libs/config/props/line.js");
+require("../../../uni_modules/uview-plus/libs/config/props/lineProgress.js");
+require("../../../uni_modules/uview-plus/libs/config/props/link.js");
+require("../../../uni_modules/uview-plus/libs/config/props/list.js");
+require("../../../uni_modules/uview-plus/libs/config/props/listItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/loadingIcon.js");
+require("../../../uni_modules/uview-plus/libs/config/props/loadingPage.js");
+require("../../../uni_modules/uview-plus/libs/config/props/loadmore.js");
+require("../../../uni_modules/uview-plus/libs/config/props/modal.js");
+require("../../../uni_modules/uview-plus/libs/config/props/navbar.js");
+require("../../../uni_modules/uview-plus/libs/config/color.js");
+require("../../../uni_modules/uview-plus/libs/config/props/noNetwork.js");
+require("../../../uni_modules/uview-plus/libs/config/props/noticeBar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/notify.js");
+require("../../../uni_modules/uview-plus/libs/config/props/numberBox.js");
+require("../../../uni_modules/uview-plus/libs/config/props/numberKeyboard.js");
+require("../../../uni_modules/uview-plus/libs/config/props/overlay.js");
+require("../../../uni_modules/uview-plus/libs/config/props/parse.js");
+require("../../../uni_modules/uview-plus/libs/config/props/picker.js");
+require("../../../uni_modules/uview-plus/libs/config/props/popup.js");
+require("../../../uni_modules/uview-plus/libs/config/props/radio.js");
+require("../../../uni_modules/uview-plus/libs/config/props/radioGroup.js");
+require("../../../uni_modules/uview-plus/libs/config/props/rate.js");
+require("../../../uni_modules/uview-plus/libs/config/props/readMore.js");
+require("../../../uni_modules/uview-plus/libs/config/props/row.js");
+require("../../../uni_modules/uview-plus/libs/config/props/rowNotice.js");
+require("../../../uni_modules/uview-plus/libs/config/props/scrollList.js");
+require("../../../uni_modules/uview-plus/libs/config/props/search.js");
+require("../../../uni_modules/uview-plus/libs/config/props/section.js");
+require("../../../uni_modules/uview-plus/libs/config/props/skeleton.js");
+require("../../../uni_modules/uview-plus/libs/config/props/slider.js");
+require("../../../uni_modules/uview-plus/libs/config/props/statusBar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/steps.js");
+require("../../../uni_modules/uview-plus/libs/config/props/stepsItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/sticky.js");
+require("../../../uni_modules/uview-plus/libs/config/props/subsection.js");
+require("../../../uni_modules/uview-plus/libs/config/props/swipeAction.js");
+require("../../../uni_modules/uview-plus/libs/config/props/swipeActionItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/swiper.js");
+require("../../../uni_modules/uview-plus/libs/config/props/swipterIndicator.js");
+require("../../../uni_modules/uview-plus/libs/config/props/switch.js");
+require("../../../uni_modules/uview-plus/libs/config/props/tabbar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/tabbarItem.js");
+require("../../../uni_modules/uview-plus/libs/config/props/tabs.js");
+require("../../../uni_modules/uview-plus/libs/config/props/tag.js");
+require("../../../uni_modules/uview-plus/libs/config/props/text.js");
+require("../../../uni_modules/uview-plus/libs/config/props/textarea.js");
+require("../../../uni_modules/uview-plus/libs/config/props/toast.js");
+require("../../../uni_modules/uview-plus/libs/config/props/toolbar.js");
+require("../../../uni_modules/uview-plus/libs/config/props/tooltip.js");
+require("../../../uni_modules/uview-plus/libs/config/props/transition.js");
+require("../../../uni_modules/uview-plus/libs/config/props/upload.js");
+require("../../../uni_modules/uview-plus/libs/config/zIndex.js");
+require("../../../uni_modules/uview-plus/libs/function/platform.js");
 if (!Array) {
   const _easycom_up_navbar2 = common_vendor.resolveComponent("up-navbar");
   const _easycom_u_icon2 = common_vendor.resolveComponent("u-icon");
-  const _component_notice = common_vendor.resolveComponent("notice");
   const _easycom_oneBtn2 = common_vendor.resolveComponent("oneBtn");
   const _easycom_up_popup2 = common_vendor.resolveComponent("up-popup");
-  (_easycom_up_navbar2 + _easycom_u_icon2 + _component_notice + _easycom_oneBtn2 + _easycom_up_popup2)();
+  (_easycom_up_navbar2 + _easycom_u_icon2 + _easycom_oneBtn2 + _easycom_up_popup2)();
 }
 const _easycom_up_navbar = () => "../../../uni_modules/uview-plus/components/u-navbar/u-navbar.js";
 const _easycom_u_icon = () => "../../../uni_modules/uview-plus/components/u-icon/u-icon.js";
 const _easycom_oneBtn = () => "../../../components/oneBtn/oneBtn.js";
 const _easycom_up_popup = () => "../../../uni_modules/uview-plus/components/u-popup/u-popup.js";
 if (!Math) {
-  (_easycom_up_navbar + _easycom_u_icon + _easycom_oneBtn + _easycom_up_popup)();
+  (_easycom_up_navbar + _easycom_u_icon + notice + _easycom_oneBtn + _easycom_up_popup)();
 }
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
-    a: common_vendor.p({
-      leftText: " ",
-      title: "事务通",
-      safeAreaInsetTop: false,
-      autoBack: false
-    }),
-    b: common_assets._imports_0,
-    c: common_vendor.p({
-      name: "arrow-right"
-    }),
-    d: common_assets._imports_0$1,
-    e: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/login/login")),
-    f: common_assets._imports_2,
-    g: common_assets._imports_3,
-    h: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/notice/notice")),
-    i: common_vendor.o($options.authentication),
-    j: common_vendor.p({
-      text: "点击认证业主"
-    }),
-    k: common_vendor.o(($event) => $data.show = false),
-    l: common_vendor.p({
-      show: $data.show,
-      mode: "center",
-      round: 10,
-      customStyle: {
-        width: "90%"
-      },
-      closeable: true
-    })
-  };
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-184b8d5d"], ["__file", "D:/work/xinjiangMiniProgram/pages/tabbar/index/index.vue"]]);
+const notice = () => "./comp/notice.js";
+const _sfc_main = {
+  __name: "index",
+  setup(__props) {
+    const { imgUrl } = config_site_config.obj;
+    const counterStore = store_index.userStore();
+    console.log(counterStore.token);
+    const show = common_vendor.ref(false);
+    function authentication() {
+      show.value = false;
+      common_vendor.index.$u.route({
+        url: "/pages/subPage/authentication/authentication"
+      });
+    }
+    let params = common_vendor.ref({
+      pageNo: 1,
+      pageSize: 20
+    });
+    let noticeList = common_vendor.ref([]);
+    async function getNoticeListFn() {
+      const { data: res } = await config_api.getNoticeList(params);
+      noticeList.value = res.list;
+    }
+    getNoticeListFn();
+    function goHome() {
+      let token = counterStore.token;
+      if (token) {
+        common_vendor.index.$u.route({
+          url: "/pages/subPage/authentication/authentication"
+        });
+      } else {
+        common_vendor.index.$u.route({
+          url: "/pages/subPage/login/login"
+        });
+      }
+    }
+    common_vendor.onPullDownRefresh(() => {
+      getNoticeListFn();
+    });
+    return (_ctx, _cache) => {
+      return common_vendor.e({
+        a: common_vendor.p({
+          leftText: " ",
+          title: "事务通",
+          safeAreaInsetTop: false,
+          autoBack: false
+        }),
+        b: common_vendor.unref(imgUrl) + "homebanner.png",
+        c: common_vendor.o(goHome),
+        d: !common_vendor.unref(counterStore).token
+      }, !common_vendor.unref(counterStore).token ? {
+        e: common_vendor.p({
+          name: "arrow-right"
+        }),
+        f: common_vendor.unref(imgUrl) + "homebanner3.png",
+        g: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/login/login"))
+      } : {}, {
+        h: common_vendor.unref(counterStore).token
+      }, common_vendor.unref(counterStore).token ? {
+        i: common_vendor.unref(imgUrl) + "homebanner3.png"
+      } : {}, {
+        j: common_vendor.unref(imgUrl) + "homebanner2.png",
+        k: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/ballots/ballotsList/ballotsList")),
+        l: common_assets._imports_0,
+        m: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/notice/notice")),
+        n: common_vendor.p({
+          list: common_vendor.unref(noticeList)
+        }),
+        o: common_vendor.o(authentication),
+        p: common_vendor.p({
+          text: "点击认证业主"
+        }),
+        q: common_vendor.o(($event) => show.value = false),
+        r: common_vendor.p({
+          show: show.value,
+          mode: "center",
+          round: 10,
+          customStyle: {
+            width: "90%"
+          },
+          closeable: true
+        })
+      });
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-184b8d5d"], ["__file", "D:/work/xinjiangMiniProgram/pages/tabbar/index/index.vue"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.json b/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.json
index 2f79a31..68a6186 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.json
+++ b/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.json
@@ -2,10 +2,10 @@
   "navigationBarTitleText": "首页",
   "navigationStyle": "custom",
   "usingComponents": {
-    "notice": "./comp/notice",
     "up-navbar": "../../../uni_modules/uview-plus/components/u-navbar/u-navbar",
     "u-icon": "../../../uni_modules/uview-plus/components/u-icon/u-icon",
     "one-btn": "../../../components/oneBtn/oneBtn",
-    "up-popup": "../../../uni_modules/uview-plus/components/u-popup/u-popup"
+    "up-popup": "../../../uni_modules/uview-plus/components/u-popup/u-popup",
+    "notice": "./comp/notice"
   }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.wxml
index 3744c17..66b5a66 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.wxml
@@ -1 +1 @@
-<view class="content data-v-184b8d5d"><up-navbar wx:if="{{a}}" class="data-v-184b8d5d" u-s="{{['left']}}" u-i="184b8d5d-0" bind:__l="__l" u-p="{{a}}"><view class=" data-v-184b8d5d" slot="left"></view></up-navbar><view class="padding data-v-184b8d5d"><view class="banner1 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{b}}" mode=""></image></view><view class="myhome data-v-184b8d5d"><view class="flex-b data-v-184b8d5d"><view class="h2 data-v-184b8d5d">我的房屋</view><view class="btn data-v-184b8d5d">关联房屋</view></view><view class="borderCard data-v-184b8d5d" bindtap="{{e}}"><view class="flex data-v-184b8d5d"><view class="text2 data-v-184b8d5d">立即登录</view><u-icon wx:if="{{c}}" class="data-v-184b8d5d" u-i="184b8d5d-1" bind:__l="__l" u-p="{{c}}"></u-icon></view><view class="text3 data-v-184b8d5d">登录成功即可关联房屋~</view><view class="banner3 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{d}}" mode=""></image></view></view></view><view class="severCon data-v-184b8d5d"><view class="h1pad data-v-184b8d5d"><view class="h1 data-v-184b8d5d">服务</view></view><view class="banner2 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{f}}" mode=""></image></view></view><view class="noticeCon data-v-184b8d5d"><view class="h1pad flex-b data-v-184b8d5d"><view class="h1 data-v-184b8d5d">公示公告</view><view class="more data-v-184b8d5d" bindtap="{{h}}"><view class="txt data-v-184b8d5d">更多</view><view class="icon data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{g}}" mode=""></image></view></view></view><notice class="data-v-184b8d5d" u-i="184b8d5d-2" bind:__l="__l"/></view></view><up-popup wx:if="{{l}}" class="data-v-184b8d5d" u-s="{{['d']}}" bindclose="{{k}}" u-i="184b8d5d-3" bind:__l="__l" u-p="{{l}}"><view class="popCon data-v-184b8d5d"><view class="hello data-v-184b8d5d">你好：</view><view class="p data-v-184b8d5d"> 欢迎来到 <text class="data-v-184b8d5d">“新疆首付公馆”</text>，为了更好的为您提供服务，请您选择房屋信息，进行业主身份认证。 </view><one-btn wx:if="{{j}}" class="data-v-184b8d5d" bindclick="{{i}}" u-i="184b8d5d-4,184b8d5d-3" bind:__l="__l" u-p="{{j}}"></one-btn></view></up-popup></view>
\ No newline at end of file
+<view class="content data-v-184b8d5d"><up-navbar wx:if="{{a}}" class="data-v-184b8d5d" u-s="{{['left']}}" u-i="184b8d5d-0" bind:__l="__l" u-p="{{a}}"><view class=" data-v-184b8d5d" slot="left"></view></up-navbar><view class="padding data-v-184b8d5d"><view class="banner1 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{b}}" mode=""></image></view><view class="myhome data-v-184b8d5d"><view class="flex-b data-v-184b8d5d"><view class="h2 data-v-184b8d5d">我的房屋</view><view class="btn data-v-184b8d5d" bindtap="{{c}}">关联房屋</view></view><view wx:if="{{d}}" class="borderCard data-v-184b8d5d" bindtap="{{g}}"><view class="flex data-v-184b8d5d"><view class="text2 data-v-184b8d5d">立即登录</view><u-icon wx:if="{{e}}" class="data-v-184b8d5d" u-i="184b8d5d-1" bind:__l="__l" u-p="{{e}}"></u-icon></view><view class="text3 data-v-184b8d5d">登录成功即可关联房屋~</view><view class="banner3 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{f}}" mode=""></image></view></view><view wx:if="{{h}}" class="borderCard data-v-184b8d5d"><view class="text data-v-184b8d5d">房屋地址：新疆首府公馆一期住宅1-1-101</view><view class="text data-v-184b8d5d">房屋面积：156.32㎡</view><view class="banner3 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{i}}" mode=""></image></view></view></view><view class="severCon data-v-184b8d5d"><view class="h1pad data-v-184b8d5d"><view class="h1 data-v-184b8d5d">服务</view></view><view class="banner2 data-v-184b8d5d" bindtap="{{k}}"><image class="data-v-184b8d5d" src="{{j}}" mode=""></image></view></view><view class="noticeCon data-v-184b8d5d"><view class="h1pad flex-b data-v-184b8d5d"><view class="h1 data-v-184b8d5d">公示公告</view><view class="more data-v-184b8d5d" bindtap="{{m}}"><view class="txt data-v-184b8d5d">更多</view><view class="icon data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{l}}" mode=""></image></view></view></view><notice wx:if="{{n}}" class="data-v-184b8d5d" u-i="184b8d5d-2" bind:__l="__l" u-p="{{n}}"/></view></view><up-popup wx:if="{{r}}" class="data-v-184b8d5d" u-s="{{['d']}}" bindclose="{{q}}" u-i="184b8d5d-3" bind:__l="__l" u-p="{{r}}"><view class="popCon data-v-184b8d5d"><view class="hello data-v-184b8d5d">你好：</view><view class="p data-v-184b8d5d"> 欢迎来到 <text class="data-v-184b8d5d">“新疆首付公馆”</text>，为了更好的为您提供服务，请您选择房屋信息，进行业主身份认证。 </view><one-btn wx:if="{{p}}" class="data-v-184b8d5d" bindclick="{{o}}" u-i="184b8d5d-4,184b8d5d-3" bind:__l="__l" u-p="{{p}}"></one-btn></view></up-popup></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.js b/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.js
index 14af079..8b3922b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.js
+++ b/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.js
@@ -1,15 +1,6 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
-const _sfc_main = {
-  data() {
-    return {
-      configList: [
-        { text: "用户协议", url: "" },
-        { text: "隐私政策", url: "" }
-      ]
-    };
-  }
-};
+const config_site_config = require("../../../config/site.config.js");
 if (!Array) {
   const _easycom_u_icon2 = common_vendor.resolveComponent("u-icon");
   _easycom_u_icon2();
@@ -18,23 +9,38 @@ const _easycom_u_icon = () => "../../../uni_modules/uview-plus/components/u-icon
 if (!Math) {
   _easycom_u_icon();
 }
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
-    a: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/login/login")),
-    b: common_vendor.f($data.configList, (item, index, i0) => {
+const _sfc_main = {
+  __name: "mine",
+  setup(__props) {
+    const { imgUrl } = config_site_config.obj;
+    const topBgUrl = imgUrl + "minebg.png";
+    console.log("topBgUrl");
+    console.log(topBgUrl);
+    const configList = common_vendor.ref([
+      { text: "用户协议", url: "/pages/subPage/privacyAgreement/privacyAgreement?type=1" },
+      { text: "隐私政策", url: "/pages/subPage/privacyAgreement/privacyAgreement?type=2" }
+    ]);
+    return (_ctx, _cache) => {
       return {
-        a: common_vendor.t(item.text),
-        b: "23ed4277-0-" + i0,
-        c: index
+        a: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/login/login")),
+        b: common_vendor.f(configList.value, (item, index, i0) => {
+          return {
+            a: common_vendor.t(item.text),
+            b: "23ed4277-0-" + i0,
+            c: index,
+            d: common_vendor.o(($event) => _ctx.$goPage(item.url), index)
+          };
+        }),
+        c: common_vendor.p({
+          name: "arrow-right"
+        }),
+        d: common_vendor.p({
+          name: "arrow-right"
+        }),
+        e: "url(" + topBgUrl + ") #F5F5F5 no-repeat"
       };
-    }),
-    c: common_vendor.p({
-      name: "arrow-right"
-    }),
-    d: common_vendor.p({
-      name: "arrow-right"
-    })
-  };
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-23ed4277"], ["__file", "D:/work/xinjiangMiniProgram/pages/tabbar/mine/mine.vue"]]);
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-23ed4277"], ["__file", "D:/work/xinjiangMiniProgram/pages/tabbar/mine/mine.vue"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.wxml b/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.wxml
index 41fbb9b..847e5be 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.wxml
@@ -1 +1 @@
-<view class="content data-v-23ed4277"><view class="padding data-v-23ed4277"><view class="userInfo flex data-v-23ed4277" bindtap="{{a}}"><view class="avatar data-v-23ed4277"></view><view class="name data-v-23ed4277">登录/注册</view></view><view class="card data-v-23ed4277"><view wx:for="{{b}}" wx:for-item="item" wx:key="c" class="li flex-b data-v-23ed4277"><view class="text data-v-23ed4277">{{item.a}}</view><u-icon wx:if="{{c}}" class="data-v-23ed4277" u-i="{{item.b}}" bind:__l="__l" u-p="{{c}}"></u-icon></view><view class="li flex-b data-v-23ed4277"><button type="default" open-type="contact" class="cotact data-v-23ed4277">联系客服</button><view class="text data-v-23ed4277">联系客服</view><u-icon wx:if="{{d}}" class="data-v-23ed4277" u-i="23ed4277-1" bind:__l="__l" u-p="{{d}}"></u-icon></view></view></view></view>
\ No newline at end of file
+<view class="content data-v-23ed4277" style="{{'background:' + e + ';' + ('background-size:' + '100% 552rpx')}}"><view class="padding data-v-23ed4277"><view class="userInfo flex data-v-23ed4277" bindtap="{{a}}"><view class="avatar data-v-23ed4277"></view><view class="name data-v-23ed4277">登录/注册</view></view><view class="card data-v-23ed4277"><view wx:for="{{b}}" wx:for-item="item" wx:key="c" class="li flex-b data-v-23ed4277" bindtap="{{item.d}}"><view class="text data-v-23ed4277">{{item.a}}</view><u-icon wx:if="{{c}}" class="data-v-23ed4277" u-i="{{item.b}}" bind:__l="__l" u-p="{{c}}"></u-icon></view><view class="li flex-b data-v-23ed4277"><button type="default" open-type="contact" class="cotact data-v-23ed4277">联系客服</button><view class="text data-v-23ed4277">联系客服</view><u-icon wx:if="{{d}}" class="data-v-23ed4277" u-i="23ed4277-1" bind:__l="__l" u-p="{{d}}"></u-icon></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.wxss b/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.wxss
index 5cdc44f..9e6f58a 100644
--- a/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.wxss
@@ -30,8 +30,6 @@ image.data-v-23ed4277 {
 }
 .content.data-v-23ed4277 {
   width: 100%;
-  background: url("../../../static/images/minebg.png") #F5F5F5 no-repeat;
-  background-size: 100% 552rpx;
   min-height: 100vh;
 }
 .content .userInfo.data-v-23ed4277 {
diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json
index 1584936..64cba45 100644
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -6,9 +6,9 @@
   },
   "setting": {
     "urlCheck": false,
-    "es6": true,
+    "es6": false,
     "postcss": false,
-    "minified": false,
+    "minified": true,
     "newFeature": true,
     "bigPackageSizeSupport": true,
     "babelSetting": {
@@ -18,7 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.5.0",
+  "libVersion": "",
   "appid": "wxb9f5233e39665f59",
   "projectname": "新疆小程序",
   "condition": {},
diff --git a/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner.png b/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner.png
new file mode 100644
index 0000000..c3cb375
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner.png differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner2.png b/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner2.png
new file mode 100644
index 0000000..4be30e5
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner2.png differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner3.png b/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner3.png
new file mode 100644
index 0000000..faf7577
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner3.png differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/bigImg/minebg.png b/unpackage/dist/dev/mp-weixin/static/images/bigImg/minebg.png
new file mode 100644
index 0000000..416dc08
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/static/images/bigImg/minebg.png differ
diff --git a/unpackage/dist/dev/mp-weixin/static/images/okIcon.png b/unpackage/dist/dev/mp-weixin/static/images/okIcon.png
new file mode 100644
index 0000000..0eea25a
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/static/images/okIcon.png differ
diff --git a/unpackage/dist/dev/mp-weixin/store/index.js b/unpackage/dist/dev/mp-weixin/store/index.js
new file mode 100644
index 0000000..4fcc0e0
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/store/index.js
@@ -0,0 +1,48 @@
+"use strict";
+const common_vendor = require("../common/vendor.js");
+const store = common_vendor.createPinia();
+const userStore = common_vendor.defineStore({
+  id: "userStore",
+  state: () => ({
+    token: common_vendor.index.getStorageSync("token") ? common_vendor.index.getStorageSync("token") : "2f58eb3901ec4396a33cc015b9b1c28c",
+    loginInfo: common_vendor.index.getStorageSync("loginInfo") ? common_vendor.index.getStorageSync("loginInfo") : {},
+    userInfo: {
+      idCard: "",
+      name: ""
+    },
+    chooseHouse: {
+      "roomNum": "",
+      "houseType": "",
+      "houseTypeName": "",
+      "communityId": "",
+      "communityName": "",
+      "userName": 0,
+      "idNo": "用户身份证号",
+      "houseId": ""
+    }
+  }),
+  actions: {
+    upDateToken(token) {
+      this.token = token;
+      common_vendor.index.setStorageSync("token", token);
+    },
+    upDateLoginInfo(info) {
+      console.log("没来这里么？");
+      this.loginInfo = info;
+      common_vendor.index.setStorageSync("loginInfo", info);
+    },
+    upDateHouse(key, value) {
+      this.chooseHouse[key] = value;
+      console.log(this.chooseHouse);
+    },
+    upDateUseInfo(key, value) {
+      this.userInfo[key] = value;
+      console.log(this.userInfo);
+    }
+  }
+});
+function useUserStoreHook() {
+  return userStore(store);
+}
+exports.useUserStoreHook = useUserStoreHook;
+exports.userStore = userStore;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/props.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/props.js
new file mode 100644
index 0000000..3d5649b
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/props.js
@@ -0,0 +1,81 @@
+"use strict";
+const uni_modules_uviewPlus_libs_vue = require("../../libs/vue.js");
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = uni_modules_uviewPlus_libs_vue.defineMixin({
+  props: {
+    // 是否显示圆点
+    isDot: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.isDot
+    },
+    // 显示的内容
+    value: {
+      type: [Number, String],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.value
+    },
+    // 显示的内容
+    modelValue: {
+      type: [Number, String],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.modelValue
+    },
+    // 是否显示
+    show: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.show
+    },
+    // 最大值，超过最大值会显示 '{max}+'
+    max: {
+      type: [Number, String],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.max
+    },
+    // 主题类型，error|warning|success|primary
+    type: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.type
+    },
+    // 当数值为 0 时，是否展示 Badge
+    showZero: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.showZero
+    },
+    // 背景颜色，优先级比type高，如设置，type参数会失效
+    bgColor: {
+      type: [String, null],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.bgColor
+    },
+    // 字体颜色
+    color: {
+      type: [String, null],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.color
+    },
+    // 徽标形状，circle-四角均为圆角，horn-左下角为直角
+    shape: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.shape
+    },
+    // 设置数字的显示方式，overflow|ellipsis|limit
+    // overflow会根据max字段判断，超出显示`${max}+`
+    // ellipsis会根据max判断，超出显示`${max}...`
+    // limit会依据1000作为判断条件，超出1000，显示`${value/1000}K`，比如2.2k、3.34w，最多保留2位小数
+    numberType: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.numberType
+    },
+    // 设置badge的位置偏移，格式为 [x, y]，也即设置的为top和right的值，absolute为true时有效
+    offset: {
+      type: Array,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.offset
+    },
+    // 是否反转背景和字体颜色
+    inverted: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.inverted
+    },
+    // 是否绝对定位
+    absolute: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.badge.absolute
+    }
+  }
+});
+exports.props = props;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.js
new file mode 100644
index 0000000..ccd04b8
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.js
@@ -0,0 +1,162 @@
+"use strict";
+const uni_modules_uviewPlus_components_uBadge_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/vue.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/test.js");
+require("../../libs/util/route.js");
+require("../../libs/function/digit.js");
+const _sfc_main = {
+  name: "u-badge",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_components_uBadge_props.props, uni_modules_uviewPlus_libs_mixin_mixin.mixin],
+  computed: {
+    // 是否将badge中心与父组件右上角重合
+    boxStyle() {
+      let style = {};
+      return style;
+    },
+    // 整个组件的样式
+    badgeStyle() {
+      const style = {};
+      if (this.color) {
+        style.color = this.color;
+      }
+      if (this.bgColor && !this.inverted) {
+        style.backgroundColor = this.bgColor;
+      }
+      if (this.absolute) {
+        style.position = "absolute";
+        if (this.offset.length) {
+          const top = this.offset[0];
+          const right = this.offset[1] || top;
+          style.top = uni_modules_uviewPlus_libs_function_index.addUnit(top);
+          style.right = uni_modules_uviewPlus_libs_function_index.addUnit(right);
+        }
+      }
+      return style;
+    },
+    showValue() {
+      switch (this.numberType) {
+        case "overflow":
+          return Number(this.value) > Number(this.max) ? this.max + "+" : this.value;
+        case "ellipsis":
+          return Number(this.value) > Number(this.max) ? "..." : this.value;
+        case "limit":
+          return Number(this.value) > 999 ? Number(this.value) >= 9999 ? Math.floor(this.value / 1e4 * 100) / 100 + "w" : Math.floor(this.value / 1e3 * 100) / 100 + "k" : this.value;
+        default:
+          return Number(this.value);
+      }
+    }
+  },
+  methods: {
+    addStyle: uni_modules_uviewPlus_libs_function_index.addStyle
+  }
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: _ctx.show && ((Number(_ctx.value) === 0 ? _ctx.showZero : true) || _ctx.isDot)
+  }, _ctx.show && ((Number(_ctx.value) === 0 ? _ctx.showZero : true) || _ctx.isDot) ? {
+    b: common_vendor.t(_ctx.isDot ? "" : $options.showValue),
+    c: common_vendor.n(_ctx.isDot ? "u-badge--dot" : "u-badge--not-dot"),
+    d: common_vendor.n(_ctx.inverted && "u-badge--inverted"),
+    e: common_vendor.n(_ctx.shape === "horn" && "u-badge--horn"),
+    f: common_vendor.n(`u-badge--${_ctx.type}${_ctx.inverted ? "--inverted" : ""}`),
+    g: common_vendor.s($options.addStyle(_ctx.customStyle)),
+    h: common_vendor.s($options.badgeStyle)
+  } : {});
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-06cca9b7"], ["__file", "D:/work/xinjiangMiniProgram/uni_modules/uview-plus/components/u-badge/u-badge.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.wxml
new file mode 100644
index 0000000..1b6ac5d
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.wxml
@@ -0,0 +1 @@
+<text wx:if="{{a}}" class="{{[c, d, e, f, 'u-badge', 'data-v-06cca9b7']}}" style="{{g + ';' + h}}">{{b}}</text>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.wxss
new file mode 100644
index 0000000..932692e
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.wxss
@@ -0,0 +1,98 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-empty.data-v-06cca9b7,
+.u-empty__wrap.data-v-06cca9b7,
+.u-tabs.data-v-06cca9b7,
+.u-tabs__wrapper.data-v-06cca9b7,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-06cca9b7,
+.u-tabs__wrapper__scroll-view.data-v-06cca9b7,
+.u-tabs__wrapper__nav.data-v-06cca9b7,
+.u-tabs__wrapper__nav__line.data-v-06cca9b7 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-badge.data-v-06cca9b7 {
+  border-top-right-radius: 100px;
+  border-top-left-radius: 100px;
+  border-bottom-left-radius: 100px;
+  border-bottom-right-radius: 100px;
+
+  display: flex;
+
+  flex-direction: row;
+  line-height: 11px;
+  text-align: center;
+  font-size: 11px;
+  color: #FFFFFF;
+}
+.u-badge--dot.data-v-06cca9b7 {
+  height: 8px;
+  width: 8px;
+}
+.u-badge--inverted.data-v-06cca9b7 {
+  font-size: 13px;
+}
+.u-badge--not-dot.data-v-06cca9b7 {
+  padding: 2px 5px;
+}
+.u-badge--horn.data-v-06cca9b7 {
+  border-bottom-left-radius: 0;
+}
+.u-badge--primary.data-v-06cca9b7 {
+  background-color: #3c9cff;
+}
+.u-badge--primary--inverted.data-v-06cca9b7 {
+  color: #3c9cff;
+}
+.u-badge--error.data-v-06cca9b7 {
+  background-color: #f56c6c;
+}
+.u-badge--error--inverted.data-v-06cca9b7 {
+  color: #f56c6c;
+}
+.u-badge--success.data-v-06cca9b7 {
+  background-color: #5ac725;
+}
+.u-badge--success--inverted.data-v-06cca9b7 {
+  color: #5ac725;
+}
+.u-badge--info.data-v-06cca9b7 {
+  background-color: #909399;
+}
+.u-badge--info--inverted.data-v-06cca9b7 {
+  color: #909399;
+}
+.u-badge--warning.data-v-06cca9b7 {
+  background-color: #f9ae3d;
+}
+.u-badge--warning--inverted.data-v-06cca9b7 {
+  color: #f9ae3d;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/props.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/props.js
deleted file mode 100644
index c39a6cf..0000000
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/props.js
+++ /dev/null
@@ -1,190 +0,0 @@
-"use strict";
-const uni_modules_uviewPlus_libs_vue = require("../../libs/vue.js");
-const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
-const props = uni_modules_uviewPlus_libs_vue.defineMixin({
-  props: {
-    // 绑定的值
-    modelValue: {
-      type: [String, Number],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.value
-    },
-    // number-数字输入键盘，app-vue下可以输入浮点数，app-nvue和小程序平台下只能输入整数
-    // idcard-身份证输入键盘，微信、支付宝、百度、QQ小程序
-    // digit-带小数点的数字键盘，App的nvue页面、微信、支付宝、百度、头条、QQ小程序
-    // text-文本输入键盘
-    type: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.type
-    },
-    // 如果 textarea 是在一个 position:fixed 的区域，需要显示指定属性 fixed 为 true，
-    // 兼容性：微信小程序、百度小程序、字节跳动小程序、QQ小程序
-    fixed: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.fixed
-    },
-    // 是否禁用输入框
-    disabled: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.disabled
-    },
-    // 禁用状态时的背景色
-    disabledColor: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.disabledColor
-    },
-    // 是否显示清除控件
-    clearable: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.clearable
-    },
-    // 是否密码类型
-    password: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.password
-    },
-    // 最大输入长度，设置为 -1 的时候不限制最大长度
-    maxlength: {
-      type: [String, Number],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.maxlength
-    },
-    // 	输入框为空时的占位符
-    placeholder: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.placeholder
-    },
-    // 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/
-    placeholderClass: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.placeholderClass
-    },
-    // 指定placeholder的样式
-    placeholderStyle: {
-      type: [String, Object],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.placeholderStyle
-    },
-    // 是否显示输入字数统计，只在 type ="text"或type ="textarea"时有效
-    showWordLimit: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.showWordLimit
-    },
-    // 设置右下角按钮的文字，有效值：send|search|next|go|done，兼容性详见uni-app文档
-    // https://uniapp.dcloud.io/component/input
-    // https://uniapp.dcloud.io/component/textarea
-    confirmType: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.confirmType
-    },
-    // 点击键盘右下角按钮时是否保持键盘不收起，H5无效
-    confirmHold: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.confirmHold
-    },
-    // focus时，点击页面的时候不收起键盘，微信小程序有效
-    holdKeyboard: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.holdKeyboard
-    },
-    // 自动获取焦点
-    // 在 H5 平台能否聚焦以及软键盘是否跟随弹出，取决于当前浏览器本身的实现。nvue 页面不支持，需使用组件的 focus()、blur() 方法控制焦点
-    focus: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.focus
-    },
-    // 键盘收起时，是否自动失去焦点，目前仅App3.0.0+有效
-    autoBlur: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.autoBlur
-    },
-    // 是否去掉 iOS 下的默认内边距，仅微信小程序，且type=textarea时有效
-    disableDefaultPadding: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.disableDefaultPadding
-    },
-    // 指定focus时光标的位置
-    cursor: {
-      type: [String, Number],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.cursor
-    },
-    // 输入框聚焦时底部与键盘的距离
-    cursorSpacing: {
-      type: [String, Number],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.cursorSpacing
-    },
-    // 光标起始位置，自动聚集时有效，需与selection-end搭配使用
-    selectionStart: {
-      type: [String, Number],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.selectionStart
-    },
-    // 光标结束位置，自动聚集时有效，需与selection-start搭配使用
-    selectionEnd: {
-      type: [String, Number],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.selectionEnd
-    },
-    // 键盘弹起时，是否自动上推页面
-    adjustPosition: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.adjustPosition
-    },
-    // 输入框内容对齐方式，可选值为：left|center|right
-    inputAlign: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.inputAlign
-    },
-    // 输入框字体的大小
-    fontSize: {
-      type: [String, Number],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.fontSize
-    },
-    // 输入框字体颜色
-    color: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.color
-    },
-    // 输入框前置图标
-    prefixIcon: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.prefixIcon
-    },
-    // 前置图标样式，对象或字符串
-    prefixIconStyle: {
-      type: [String, Object],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.prefixIconStyle
-    },
-    // 输入框后置图标
-    suffixIcon: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.suffixIcon
-    },
-    // 后置图标样式，对象或字符串
-    suffixIconStyle: {
-      type: [String, Object],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.suffixIconStyle
-    },
-    // 边框类型，surround-四周边框，bottom-底部边框，none-无边框
-    border: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.border
-    },
-    // 是否只读，与disabled不同之处在于disabled会置灰组件，而readonly则不会
-    readonly: {
-      type: Boolean,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.readonly
-    },
-    // 输入框形状，circle-圆形，square-方形
-    shape: {
-      type: String,
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.shape
-    },
-    // 用于处理或者过滤输入框内容的方法
-    formatter: {
-      type: [Function, null],
-      default: () => uni_modules_uviewPlus_libs_config_props.defProps.input.formatter
-    },
-    // 是否忽略组件内对文本合成系统事件的处理
-    ignoreCompositionEvent: {
-      type: Boolean,
-      default: true
-    }
-  }
-});
-exports.props = props;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.js
deleted file mode 100644
index 6793b74..0000000
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.js
+++ /dev/null
@@ -1,327 +0,0 @@
-"use strict";
-const uni_modules_uviewPlus_components_uInput_props = require("./props.js");
-const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
-const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
-const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
-const common_vendor = require("../../../../common/vendor.js");
-require("../../libs/vue.js");
-require("../../libs/config/props.js");
-require("../../libs/config/config.js");
-require("../../libs/config/props/actionSheet.js");
-require("../../libs/config/props/album.js");
-require("../../libs/config/props/alert.js");
-require("../../libs/config/props/avatar.js");
-require("../../libs/config/props/avatarGroup.js");
-require("../../libs/config/props/backtop.js");
-require("../../libs/config/props/badge.js");
-require("../../libs/config/props/button.js");
-require("../../libs/config/props/calendar.js");
-require("../../libs/config/props/carKeyboard.js");
-require("../../libs/config/props/cell.js");
-require("../../libs/config/props/cellGroup.js");
-require("../../libs/config/props/checkbox.js");
-require("../../libs/config/props/checkboxGroup.js");
-require("../../libs/config/props/circleProgress.js");
-require("../../libs/config/props/code.js");
-require("../../libs/config/props/codeInput.js");
-require("../../libs/config/props/col.js");
-require("../../libs/config/props/collapse.js");
-require("../../libs/config/props/collapseItem.js");
-require("../../libs/config/props/columnNotice.js");
-require("../../libs/config/props/countDown.js");
-require("../../libs/config/props/countTo.js");
-require("../../libs/config/props/datetimePicker.js");
-require("../../libs/config/props/divider.js");
-require("../../libs/config/props/empty.js");
-require("../../libs/config/props/form.js");
-require("../../libs/config/props/formItem.js");
-require("../../libs/config/props/gap.js");
-require("../../libs/config/props/grid.js");
-require("../../libs/config/props/gridItem.js");
-require("../../libs/config/props/icon.js");
-require("../../libs/config/props/image.js");
-require("../../libs/config/props/indexAnchor.js");
-require("../../libs/config/props/indexList.js");
-require("../../libs/config/props/input.js");
-require("../../libs/config/props/keyboard.js");
-require("../../libs/config/props/line.js");
-require("../../libs/config/props/lineProgress.js");
-require("../../libs/config/props/link.js");
-require("../../libs/config/props/list.js");
-require("../../libs/config/props/listItem.js");
-require("../../libs/config/props/loadingIcon.js");
-require("../../libs/config/props/loadingPage.js");
-require("../../libs/config/props/loadmore.js");
-require("../../libs/config/props/modal.js");
-require("../../libs/config/props/navbar.js");
-require("../../libs/config/color.js");
-require("../../libs/config/props/noNetwork.js");
-require("../../libs/config/props/noticeBar.js");
-require("../../libs/config/props/notify.js");
-require("../../libs/config/props/numberBox.js");
-require("../../libs/config/props/numberKeyboard.js");
-require("../../libs/config/props/overlay.js");
-require("../../libs/config/props/parse.js");
-require("../../libs/config/props/picker.js");
-require("../../libs/config/props/popup.js");
-require("../../libs/config/props/radio.js");
-require("../../libs/config/props/radioGroup.js");
-require("../../libs/config/props/rate.js");
-require("../../libs/config/props/readMore.js");
-require("../../libs/config/props/row.js");
-require("../../libs/config/props/rowNotice.js");
-require("../../libs/config/props/scrollList.js");
-require("../../libs/config/props/search.js");
-require("../../libs/config/props/section.js");
-require("../../libs/config/props/skeleton.js");
-require("../../libs/config/props/slider.js");
-require("../../libs/config/props/statusBar.js");
-require("../../libs/config/props/steps.js");
-require("../../libs/config/props/stepsItem.js");
-require("../../libs/config/props/sticky.js");
-require("../../libs/config/props/subsection.js");
-require("../../libs/config/props/swipeAction.js");
-require("../../libs/config/props/swipeActionItem.js");
-require("../../libs/config/props/swiper.js");
-require("../../libs/config/props/swipterIndicator.js");
-require("../../libs/config/props/switch.js");
-require("../../libs/config/props/tabbar.js");
-require("../../libs/config/props/tabbarItem.js");
-require("../../libs/config/props/tabs.js");
-require("../../libs/config/props/tag.js");
-require("../../libs/config/props/text.js");
-require("../../libs/config/props/textarea.js");
-require("../../libs/config/props/toast.js");
-require("../../libs/config/props/toolbar.js");
-require("../../libs/config/props/tooltip.js");
-require("../../libs/config/props/transition.js");
-require("../../libs/config/props/upload.js");
-require("../../libs/function/test.js");
-require("../../libs/util/route.js");
-require("../../libs/function/digit.js");
-const _sfc_main = {
-  name: "u-input",
-  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uInput_props.props],
-  data() {
-    return {
-      // 清除操作
-      clearInput: false,
-      // 输入框的值
-      innerValue: "",
-      // 是否处于获得焦点状态
-      focused: false,
-      // value是否第一次变化，在watch中，由于加入immediate属性，会在第一次触发，此时不应该认为value发生了变化
-      firstChange: true,
-      // value绑定值的变化是由内部还是外部引起的
-      changeFromInner: false,
-      // 过滤处理方法
-      innerFormatter: (value) => value
-    };
-  },
-  created() {
-    if (this.formatter) {
-      this.innerFormatter = this.formatter;
-    }
-  },
-  watch: {
-    modelValue: {
-      immediate: true,
-      handler(newVal, oldVal) {
-        if (this.changeFromInner || this.innerValue === newVal) {
-          this.changeFromInner = false;
-          return;
-        }
-        this.innerValue = newVal;
-        if (this.firstChange === false && this.changeFromInner === false) {
-          this.valueChange(this.innerValue, true);
-        } else {
-          if (!this.firstChange)
-            uni_modules_uviewPlus_libs_function_index.formValidate(this, "change");
-        }
-        this.firstChange = false;
-        this.changeFromInner = false;
-      }
-    }
-  },
-  computed: {
-    // 是否显示清除控件
-    isShowClear() {
-      const { clearable, readonly, focused, innerValue } = this;
-      return !!clearable && !readonly && !!focused && innerValue !== "";
-    },
-    // 组件的类名
-    inputClass() {
-      let classes = [], { border, disabled, shape } = this;
-      border === "surround" && (classes = classes.concat(["u-border", "u-input--radius"]));
-      classes.push(`u-input--${shape}`);
-      border === "bottom" && (classes = classes.concat([
-        "u-border-bottom",
-        "u-input--no-radius"
-      ]));
-      return classes.join(" ");
-    },
-    // 组件的样式
-    wrapperStyle() {
-      const style = {};
-      if (this.disabled) {
-        style.backgroundColor = this.disabledColor;
-      }
-      if (this.border === "none") {
-        style.padding = "0";
-      } else {
-        style.paddingTop = "6px";
-        style.paddingBottom = "6px";
-        style.paddingLeft = "9px";
-        style.paddingRight = "9px";
-      }
-      return uni_modules_uviewPlus_libs_function_index.deepMerge(style, uni_modules_uviewPlus_libs_function_index.addStyle(this.customStyle));
-    },
-    // 输入框的样式
-    inputStyle() {
-      const style = {
-        color: this.color,
-        fontSize: uni_modules_uviewPlus_libs_function_index.addUnit(this.fontSize),
-        textAlign: this.inputAlign
-      };
-      return style;
-    }
-  },
-  emits: ["update:modelValue", "focus", "blur", "change", "confirm", "clear", "keyboardheightchange"],
-  methods: {
-    // 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
-    setFormatter(e) {
-      this.innerFormatter = e;
-    },
-    // 当键盘输入时，触发input事件
-    onInput(e) {
-      let { value = "" } = e.detail || {};
-      this.innerValue = value;
-      this.$nextTick(() => {
-        let formatValue = this.innerFormatter(value);
-        this.innerValue = formatValue;
-        this.valueChange(formatValue);
-      });
-    },
-    // 输入框失去焦点时触发
-    onBlur(event) {
-      this.$emit("blur", event.detail.value);
-      uni_modules_uviewPlus_libs_function_index.sleep(150).then(() => {
-        this.focused = false;
-      });
-      uni_modules_uviewPlus_libs_function_index.formValidate(this, "blur");
-    },
-    // 输入框聚焦时触发
-    onFocus(event) {
-      this.focused = true;
-      this.$emit("focus");
-    },
-    // 点击完成按钮时触发
-    onConfirm(event) {
-      this.$emit("confirm", this.innerValue);
-    },
-    // 键盘高度发生变化的时候触发此事件
-    // 兼容性：微信小程序2.7.0+、App 3.1.0+
-    onkeyboardheightchange(event) {
-      this.$emit("keyboardheightchange", event);
-    },
-    // 内容发生变化，进行处理
-    valueChange(value, isOut = false) {
-      if (this.clearInput) {
-        this.innerValue = "";
-        this.clearInput = false;
-      }
-      this.$nextTick(() => {
-        if (!isOut || this.clearInput) {
-          this.changeFromInner = true;
-          this.$emit("change", value);
-          this.$emit("update:modelValue", value);
-        }
-        uni_modules_uviewPlus_libs_function_index.formValidate(this, "change");
-      });
-    },
-    // 点击清除控件
-    onClear() {
-      this.clearInput = true;
-      this.innerValue = "";
-      this.$nextTick(() => {
-        this.valueChange("");
-        this.$emit("clear");
-      });
-    },
-    /**
-     * 在安卓nvue上，事件无法冒泡
-     * 在某些时间，我们希望监听u-from-item的点击事件，此时会导致点击u-form-item内的u-input后
-     * 无法触发u-form-item的点击事件，这里通过手动调用u-form-item的方法进行触发
-     */
-    clickHandler() {
-    }
-  }
-};
-if (!Array) {
-  const _easycom_u_icon2 = common_vendor.resolveComponent("u-icon");
-  _easycom_u_icon2();
-}
-const _easycom_u_icon = () => "../u-icon/u-icon.js";
-if (!Math) {
-  _easycom_u_icon();
-}
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return common_vendor.e({
-    a: _ctx.prefixIcon || _ctx.$slots.prefix
-  }, _ctx.prefixIcon || _ctx.$slots.prefix ? {
-    b: common_vendor.p({
-      name: _ctx.prefixIcon,
-      size: "18",
-      customStyle: _ctx.prefixIconStyle
-    })
-  } : {}, {
-    c: common_vendor.s($options.inputStyle),
-    d: _ctx.type,
-    e: _ctx.focus,
-    f: _ctx.cursor,
-    g: $data.innerValue,
-    h: _ctx.autoBlur,
-    i: _ctx.disabled || _ctx.readonly,
-    j: _ctx.maxlength,
-    k: _ctx.placeholder,
-    l: _ctx.placeholderStyle,
-    m: _ctx.placeholderClass,
-    n: _ctx.confirmType,
-    o: _ctx.confirmHold,
-    p: _ctx.holdKeyboard,
-    q: _ctx.cursorSpacing,
-    r: _ctx.adjustPosition,
-    s: _ctx.selectionEnd,
-    t: _ctx.selectionStart,
-    v: _ctx.password || _ctx.type === "password" || false,
-    w: _ctx.ignoreCompositionEvent,
-    x: common_vendor.o((...args) => $options.onInput && $options.onInput(...args)),
-    y: common_vendor.o((...args) => $options.onBlur && $options.onBlur(...args)),
-    z: common_vendor.o((...args) => $options.onFocus && $options.onFocus(...args)),
-    A: common_vendor.o((...args) => $options.onConfirm && $options.onConfirm(...args)),
-    B: common_vendor.o((...args) => $options.onkeyboardheightchange && $options.onkeyboardheightchange(...args)),
-    C: common_vendor.o((...args) => $options.clickHandler && $options.clickHandler(...args)),
-    D: $options.isShowClear
-  }, $options.isShowClear ? {
-    E: common_vendor.p({
-      name: "close",
-      size: "11",
-      color: "#ffffff",
-      customStyle: "line-height: 12px"
-    }),
-    F: common_vendor.o((...args) => $options.onClear && $options.onClear(...args))
-  } : {}, {
-    G: _ctx.suffixIcon || _ctx.$slots.suffix
-  }, _ctx.suffixIcon || _ctx.$slots.suffix ? {
-    H: common_vendor.p({
-      name: _ctx.suffixIcon,
-      size: "18",
-      customStyle: _ctx.suffixIconStyle
-    })
-  } : {}, {
-    I: common_vendor.n($options.inputClass),
-    J: common_vendor.s($options.wrapperStyle)
-  });
-}
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-df79975b"], ["__file", "D:/work/xinjiangMiniProgram/uni_modules/uview-plus/components/u-input/u-input.vue"]]);
-wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxml
deleted file mode 100644
index b0ab4eb..0000000
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxml
+++ /dev/null
@@ -1 +0,0 @@
-<view class="{{['u-input', 'data-v-df79975b', I]}}" style="{{J}}"><view class="u-input__content data-v-df79975b"><view wx:if="{{a}}" class="u-input__content__prefix-icon data-v-df79975b"><block wx:if="{{$slots.prefix}}"><slot name="prefix"></slot></block><block wx:else><u-icon wx:if="{{b}}" class="data-v-df79975b" u-i="df79975b-0" bind:__l="__l" u-p="{{b}}"></u-icon></block></view><view class="u-input__content__field-wrapper data-v-df79975b" bindtap="{{C}}"><block wx:if="{{r0}}"><input class="u-input__content__field-wrapper__field data-v-df79975b" style="{{c}}" type="{{d}}" focus="{{e}}" cursor="{{f}}" value="{{g}}" auto-blur="{{h}}" disabled="{{i}}" maxlength="{{j}}" placeholder="{{k}}" placeholder-style="{{l}}" placeholder-class="{{m}}" confirm-type="{{n}}" confirm-hold="{{o}}" hold-keyboard="{{p}}" cursor-spacing="{{q}}" adjust-position="{{r}}" selection-end="{{s}}" selection-start="{{t}}" password="{{v}}" ignoreCompositionEvent="{{w}}" bindinput="{{x}}" bindblur="{{y}}" bindfocus="{{z}}" bindconfirm="{{A}}" bindkeyboardheightchange="{{B}}"/></block></view><view wx:if="{{D}}" class="u-input__content__clear data-v-df79975b" bindtap="{{F}}"><u-icon wx:if="{{E}}" class="data-v-df79975b" u-i="df79975b-1" bind:__l="__l" u-p="{{E}}"></u-icon></view><view wx:if="{{G}}" class="u-input__content__subfix-icon data-v-df79975b"><block wx:if="{{$slots.suffix}}"><slot name="suffix"></slot></block><block wx:else><u-icon wx:if="{{H}}" class="data-v-df79975b" u-i="df79975b-2" bind:__l="__l" u-p="{{H}}"></u-icon></block></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/props.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/props.js
new file mode 100644
index 0000000..655daab
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/props.js
@@ -0,0 +1,68 @@
+"use strict";
+const uni_modules_uviewPlus_libs_vue = require("../../libs/vue.js");
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = uni_modules_uviewPlus_libs_vue.defineMixin({
+  props: {
+    // 滑块的移动过渡时间，单位ms
+    duration: {
+      type: Number,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.duration
+    },
+    // tabs标签数组
+    list: {
+      type: Array,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.list
+    },
+    // 滑块颜色
+    lineColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.lineColor
+    },
+    // 菜单选择中时的样式
+    activeStyle: {
+      type: [String, Object],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.activeStyle
+    },
+    // 菜单非选中时的样式
+    inactiveStyle: {
+      type: [String, Object],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.inactiveStyle
+    },
+    // 滑块长度
+    lineWidth: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.lineWidth
+    },
+    // 滑块高度
+    lineHeight: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.lineHeight
+    },
+    // 滑块背景显示大小，当滑块背景设置为图片时使用
+    lineBgSize: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.lineBgSize
+    },
+    // 菜单item的样式
+    itemStyle: {
+      type: [String, Object],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.itemStyle
+    },
+    // 菜单是否可滚动
+    scrollable: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.scrollable
+    },
+    // 当前选中标签的索引
+    current: {
+      type: [Number, String],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.current
+    },
+    // 默认读取的键名
+    keyName: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.tabs.keyName
+    }
+  }
+});
+exports.props = props;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.js
new file mode 100644
index 0000000..c636f2b
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.js
@@ -0,0 +1,303 @@
+"use strict";
+const uni_modules_uviewPlus_components_uTabs_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/vue.js");
+require("../../libs/function/test.js");
+require("../../libs/util/route.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/digit.js");
+const _sfc_main = {
+  name: "u-tabs",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uTabs_props.props],
+  data() {
+    return {
+      firstTime: true,
+      scrollLeft: 0,
+      scrollViewWidth: 0,
+      lineOffsetLeft: 0,
+      tabsRect: {
+        left: 0
+      },
+      innerCurrent: 0,
+      moving: false
+    };
+  },
+  watch: {
+    current: {
+      immediate: true,
+      handler(newValue, oldValue) {
+        if (newValue !== this.innerCurrent) {
+          this.innerCurrent = newValue;
+          this.$nextTick(() => {
+            this.resize();
+          });
+        }
+      }
+    },
+    // list变化时，重新渲染list各项信息
+    list() {
+      this.$nextTick(() => {
+        this.resize();
+      });
+    }
+  },
+  computed: {
+    textStyle() {
+      return (index) => {
+        const style = {};
+        const customeStyle = index === this.innerCurrent ? uni_modules_uviewPlus_libs_function_index.addStyle(this.activeStyle) : uni_modules_uviewPlus_libs_function_index.addStyle(this.inactiveStyle);
+        if (this.list[index].disabled) {
+          style.color = "#c8c9cc";
+        }
+        return uni_modules_uviewPlus_libs_function_index.deepMerge(customeStyle, style);
+      };
+    },
+    propsBadge() {
+      return uni_modules_uviewPlus_libs_config_props.defProps.badge;
+    }
+  },
+  async mounted() {
+    this.init();
+  },
+  emits: ["click", "change"],
+  methods: {
+    addStyle: uni_modules_uviewPlus_libs_function_index.addStyle,
+    addUnit: uni_modules_uviewPlus_libs_function_index.addUnit,
+    setLineLeft() {
+      const tabItem = this.list[this.innerCurrent];
+      if (!tabItem) {
+        return;
+      }
+      let lineOffsetLeft = this.list.slice(0, this.innerCurrent).reduce((total, curr) => total + curr.rect.width, 0);
+      const lineWidth = uni_modules_uviewPlus_libs_function_index.getPx(this.lineWidth);
+      this.lineOffsetLeft = lineOffsetLeft + (tabItem.rect.width - lineWidth) / 2;
+      if (this.firstTime) {
+        setTimeout(() => {
+          this.firstTime = false;
+        }, 10);
+      }
+    },
+    // nvue下设置滑块的位置
+    animation(x, duration = 0) {
+    },
+    // 点击某一个标签
+    clickHandler(item, index) {
+      this.$emit("click", {
+        ...item,
+        index
+      }, index);
+      if (item.disabled)
+        return;
+      this.innerCurrent = index;
+      this.resize();
+      this.$emit("change", {
+        ...item,
+        index
+      }, index);
+    },
+    init() {
+      uni_modules_uviewPlus_libs_function_index.sleep().then(() => {
+        this.resize();
+      });
+    },
+    setScrollLeft() {
+      const tabRect = this.list[this.innerCurrent];
+      const offsetLeft = this.list.slice(0, this.innerCurrent).reduce((total, curr) => {
+        return total + curr.rect.width;
+      }, 0);
+      const windowWidth = uni_modules_uviewPlus_libs_function_index.sys().windowWidth;
+      let scrollLeft = offsetLeft - (this.tabsRect.width - tabRect.rect.width) / 2 - (windowWidth - this.tabsRect.right) / 2 + this.tabsRect.left / 2;
+      scrollLeft = Math.min(scrollLeft, this.scrollViewWidth - this.tabsRect.width);
+      this.scrollLeft = Math.max(0, scrollLeft);
+    },
+    // 获取所有标签的尺寸
+    resize() {
+      if (this.list.length === 0) {
+        return;
+      }
+      Promise.all([this.getTabsRect(), this.getAllItemRect()]).then(([tabsRect, itemRect = []]) => {
+        this.tabsRect = tabsRect;
+        this.scrollViewWidth = 0;
+        itemRect.map((item, index) => {
+          this.scrollViewWidth += item.width;
+          this.list[index].rect = item;
+        });
+        this.setLineLeft();
+        this.setScrollLeft();
+      });
+    },
+    // 获取导航菜单的尺寸
+    getTabsRect() {
+      return new Promise((resolve) => {
+        this.queryRect("u-tabs__wrapper__scroll-view").then((size) => resolve(size));
+      });
+    },
+    // 获取所有标签的尺寸
+    getAllItemRect() {
+      return new Promise((resolve) => {
+        const promiseAllArr = this.list.map((item, index) => this.queryRect(
+          `u-tabs__wrapper__nav__item-${index}`,
+          true
+        ));
+        Promise.all(promiseAllArr).then((sizes) => resolve(sizes));
+      });
+    },
+    // 获取各个标签的尺寸
+    queryRect(el, item) {
+      return new Promise((resolve) => {
+        this.$uGetRect(`.${el}`).then((size) => {
+          resolve(size);
+        });
+      });
+    }
+  }
+};
+if (!Array) {
+  const _easycom_u_badge2 = common_vendor.resolveComponent("u-badge");
+  _easycom_u_badge2();
+}
+const _easycom_u_badge = () => "../u-badge/u-badge.js";
+if (!Math) {
+  _easycom_u_badge();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {
+    a: common_vendor.f(_ctx.list, (item, index, i0) => {
+      return {
+        a: common_vendor.t(item[_ctx.keyName]),
+        b: common_vendor.n(item.disabled && "u-tabs__wrapper__nav__item__text--disabled"),
+        c: common_vendor.s($options.textStyle(index)),
+        d: "02b0c54f-0-" + i0,
+        e: common_vendor.p({
+          show: !!(item.badge && (item.badge.show || item.badge.isDot || item.badge.value)),
+          isDot: item.badge && item.badge.isDot || $options.propsBadge.isDot,
+          value: item.badge && item.badge.value || $options.propsBadge.value,
+          max: item.badge && item.badge.max || $options.propsBadge.max,
+          type: item.badge && item.badge.type || $options.propsBadge.type,
+          showZero: item.badge && item.badge.showZero || $options.propsBadge.showZero,
+          bgColor: item.badge && item.badge.bgColor || $options.propsBadge.bgColor,
+          color: item.badge && item.badge.color || $options.propsBadge.color,
+          shape: item.badge && item.badge.shape || $options.propsBadge.shape,
+          numberType: item.badge && item.badge.numberType || $options.propsBadge.numberType,
+          inverted: item.badge && item.badge.inverted || $options.propsBadge.inverted,
+          customStyle: "margin-left: 4px;"
+        }),
+        f: index,
+        g: common_vendor.o(($event) => $options.clickHandler(item, index), index),
+        h: `u-tabs__wrapper__nav__item-${index}`,
+        i: common_vendor.n(`u-tabs__wrapper__nav__item-${index}`),
+        j: common_vendor.n(item.disabled && "u-tabs__wrapper__nav__item--disabled")
+      };
+    }),
+    b: common_vendor.s($options.addStyle(_ctx.itemStyle)),
+    c: common_vendor.s({
+      flex: _ctx.scrollable ? "" : 1
+    }),
+    d: common_vendor.s({
+      width: $options.addUnit(_ctx.lineWidth),
+      transform: `translate(${$data.lineOffsetLeft}px)`,
+      transitionDuration: `${$data.firstTime ? 0 : _ctx.duration}ms`,
+      height: $options.addUnit(_ctx.lineHeight),
+      background: _ctx.lineColor,
+      backgroundSize: _ctx.lineBgSize
+    }),
+    e: _ctx.scrollable,
+    f: $data.scrollLeft,
+    g: common_vendor.n(_ctx.customClass)
+  };
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-02b0c54f"], ["__file", "D:/work/xinjiangMiniProgram/uni_modules/uview-plus/components/u-tabs/u-tabs.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.json b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.json
similarity index 57%
rename from unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.json
rename to unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.json
index fcde44c..ac418c8 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.json
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.json
@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "u-icon": "../u-icon/u-icon"
+    "u-badge": "../u-badge/u-badge"
   }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.wxml
new file mode 100644
index 0000000..e919563
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.wxml
@@ -0,0 +1 @@
+<view class="{{['u-tabs', 'data-v-02b0c54f', g]}}"><view class="u-tabs__wrapper data-v-02b0c54f"><slot name="left"/><view class="u-tabs__wrapper__scroll-view-wrapper data-v-02b0c54f"><scroll-view scroll-x="{{e}}" scroll-left="{{f}}" scroll-with-animation class="u-tabs__wrapper__scroll-view data-v-02b0c54f" show-scrollbar="{{false}}" ref="u-tabs__wrapper__scroll-view"><view class="u-tabs__wrapper__nav data-v-02b0c54f" ref="u-tabs__wrapper__nav"><view wx:for="{{a}}" wx:for-item="item" wx:key="f" bindtap="{{item.g}}" ref="{{item.h}}" style="{{b + ';' + c}}" class="{{['u-tabs__wrapper__nav__item', 'data-v-02b0c54f', item.i, item.j]}}"><text class="{{[item.b, 'u-tabs__wrapper__nav__item__text', 'data-v-02b0c54f']}}" style="{{item.c}}">{{item.a}}</text><u-badge wx:if="{{item.e}}" class="data-v-02b0c54f" u-i="{{item.d}}" bind:__l="__l" u-p="{{item.e}}"></u-badge></view><view class="u-tabs__wrapper__nav__line data-v-02b0c54f" ref="u-tabs__wrapper__nav__line" style="{{d}}"></view></view></scroll-view></view><slot name="right"/></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.wxss
similarity index 55%
rename from unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxss
rename to unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.wxss
index 7ac1342..d64e62e 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxss
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.wxss
@@ -23,14 +23,14 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.u-empty.data-v-df79975b,
-.u-empty__wrap.data-v-df79975b,
-.u-tabs.data-v-df79975b,
-.u-tabs__wrapper.data-v-df79975b,
-.u-tabs__wrapper__scroll-view-wrapper.data-v-df79975b,
-.u-tabs__wrapper__scroll-view.data-v-df79975b,
-.u-tabs__wrapper__nav.data-v-df79975b,
-.u-tabs__wrapper__nav__line.data-v-df79975b {
+.u-empty.data-v-02b0c54f,
+.u-empty__wrap.data-v-02b0c54f,
+.u-tabs.data-v-02b0c54f,
+.u-tabs__wrapper.data-v-02b0c54f,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-02b0c54f,
+.u-tabs__wrapper__scroll-view.data-v-02b0c54f,
+.u-tabs__wrapper__nav.data-v-02b0c54f,
+.u-tabs__wrapper__nav__line.data-v-02b0c54f {
   display: flex;
   flex-direction: column;
   flex-shrink: 0;
@@ -39,67 +39,59 @@
   align-items: stretch;
   align-content: flex-start;
 }
-.u-input.data-v-df79975b {
+.u-tabs__wrapper.data-v-02b0c54f {
 
   display: flex;
 
   flex-direction: row;
   align-items: center;
-  justify-content: space-between;
-  flex: 1;
-}
-.u-input--radius.data-v-df79975b, .u-input--square.data-v-df79975b {
-  border-radius: 4px;
-}
-.u-input--no-radius.data-v-df79975b {
-  border-radius: 0;
-}
-.u-input--circle.data-v-df79975b {
-  border-radius: 100px;
 }
-.u-input__content.data-v-df79975b {
+.u-tabs__wrapper__scroll-view-wrapper.data-v-02b0c54f {
   flex: 1;
+  overflow: auto hidden;
+}
+.u-tabs__wrapper__scroll-view.data-v-02b0c54f {
 
   display: flex;
 
   flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
+  flex: 1;
 }
-.u-input__content__field-wrapper.data-v-df79975b {
-  position: relative;
+.u-tabs__wrapper__nav.data-v-02b0c54f {
 
   display: flex;
 
   flex-direction: row;
-  margin: 0;
-  flex: 1;
-}
-.u-input__content__field-wrapper__field.data-v-df79975b {
-  line-height: 26px;
-  text-align: left;
-  color: #303133;
-  height: 24px;
-  font-size: 15px;
-  flex: 1;
+  position: relative;
 }
-.u-input__content__clear.data-v-df79975b {
-  width: 20px;
-  height: 20px;
-  border-radius: 100px;
-  background-color: #c6c7cb;
+.u-tabs__wrapper__nav__item.data-v-02b0c54f {
+  padding: 0 11px;
 
   display: flex;
 
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  transform: scale(0.82);
-  margin-left: 4px;
+  cursor: pointer;
 }
-.u-input__content__subfix-icon.data-v-df79975b {
-  margin-left: 4px;
+.u-tabs__wrapper__nav__item--disabled.data-v-02b0c54f {
+  cursor: not-allowed;
 }
-.u-input__content__prefix-icon.data-v-df79975b {
-  margin-right: 4px;
+.u-tabs__wrapper__nav__item__text.data-v-02b0c54f {
+  font-size: 15px;
+  color: #606266;
+  white-space: nowrap !important;
+}
+.u-tabs__wrapper__nav__item__text--disabled.data-v-02b0c54f {
+  color: #c8c9cc !important;
+}
+.u-tabs__wrapper__nav__line.data-v-02b0c54f {
+  height: 3px;
+  background: #3c9cff;
+  width: 30px;
+  position: absolute;
+  bottom: 2px;
+  border-radius: 100px;
+  transition-property: transform;
+  transition-duration: 300ms;
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/function/index.js b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/function/index.js
index d108352..46fcd5f 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/function/index.js
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/function/index.js
@@ -501,3 +501,4 @@ exports.page = page;
 exports.queryParams = queryParams;
 exports.sleep = sleep;
 exports.sys = sys;
+exports.toast = toast;