好啊

4 months ago · 5c2befa798
112 changed files with 4152 additions and 1736 deletions
--- 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')
--- 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>
--- 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)
+ 
+ 
 
 
 
--- 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)
 		}
 		
 		// 自定义参数
--- 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'
--- 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"
+                }
+            }
+        }
+    }
 }
--- a/mp_ecard_sdk/constants/log.js
+++ 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;
--- a/mp_ecard_sdk/globalConfig.js
+++ b/mp_ecard_sdk/globalConfig.js
@ -0,0 +1 @@
+export default{normalPath:""};
--- a/mp_ecard_sdk/index.css
+++ 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}
--- a/mp_ecard_sdk/index/index.js
+++ 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)}}};
--- a/mp_ecard_sdk/index/index.vue
+++ 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>
--- a/mp_ecard_sdk/main.js
+++ 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};
--- a/mp_ecard_sdk/utils/http.js
+++ 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};
--- a/mp_ecard_sdk/utils/index.js
+++ 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};
--- a/mp_ecard_sdk/utils/validate.js
+++ 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};
--- 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"
 		}
-}
+	}
+}
--- 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 {
--- 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>
--- 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;
--- 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;
--- a/pages/subPage/ballots/ballotsList/ballotsList.vue
+++ 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>
--- a/pages/subPage/ballots/vote/vote.vue
+++ b/pages/subPage/ballots/vote/vote.vue
@ -0,0 +1,11 @@
+<template>
+	<view class="content">
+		66
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
--- a/pages/subPage/login/login
+++ b/pages/subPage/login/login
@ -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>
--- 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;
--- 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() {
--- 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>
--- 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>
--- 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 {
--- a/static/images/bigImg/homebanner.png
+++ b/static/images/bigImg/homebanner.png
--- a/static/images/bigImg/homebanner2.png
+++ b/static/images/bigImg/homebanner2.png
--- a/static/images/bigImg/homebanner3.png
+++ b/static/images/bigImg/homebanner3.png
--- a/static/images/bigImg/minebg.png
+++ b/static/images/bigImg/minebg.png
--- a/static/images/okIcon.png
+++ b/static/images/okIcon.png
--- 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)
+	}
  },
-});
+});
+
+export function useUserStoreHook() {
+  return userStore(store);
+}
--- 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
  };
--- 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": {}
 }
--- 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;
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
--- 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)),
--- 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;
--- 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") {
--- 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'
--- a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/constants/log.js
+++ 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;
--- a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/globalConfig.js
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/globalConfig.js
@ -0,0 +1,3 @@
+"use strict";
+const globalConfig = { normalPath: "" };
+exports.globalConfig = globalConfig;
--- a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.js
+++ 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);
--- a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.json
+++ b/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.json
@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "腾讯云E证通授权",
+  "usingComponents": {}
+}
--- a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxml
+++ 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>
--- a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxss
+++ 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}
--- a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/main.js
+++ 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;
--- a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/utils/index.js
+++ 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;
--- a/unpackage/dist/dev/mp-weixin/mp_ecard_sdk/utils/validate.js
+++ 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;
--- 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);
--- 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>
+<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>
--- 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;
--- 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);
--- 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": {}
 }
--- 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>
+<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>
--- 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);
--- 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": {}
 }
--- 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>
+<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>
--- 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);
--- 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>
+<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>
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.js
+++ 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);
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.json
+++ 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"
+  }
+}
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxml
+++ 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>
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxss
+++ 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;
+}
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.js
+++ 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);
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.json
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.json
@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "投票表决",
+  "enablePullDownRefresh": false,
+  "backgroundTextStyle": "dark",
+  "usingComponents": {}
+}
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxml
@ -0,0 +1 @@
+<view class="content"> 66 </view>
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxss
--- 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);
--- 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>
+<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>
--- 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;
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.json
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.json
@ -1,9 +0,0 @@
-{
-  "navigationBarTitleText": "登录",
-  "enablePullDownRefresh": false,
-  "backgroundTextStyle": "dark",
-  "usingComponents": {
-    "one-btn": "../../../components/oneBtn/oneBtn",
-    "privacy-radion": "../../../components/privacyRadion/privacyRadion"
-  }
-}
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxml
@ -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>
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxss
@ -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;
-}
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.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);
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.json
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.json
@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "用户协议",
+  "enablePullDownRefresh": false,
+  "backgroundTextStyle": "dark",
+  "usingComponents": {}
+}
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxml
@ -0,0 +1 @@
+<view class="main"><web-view src="{{a}}"></web-view></view>
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxss
--- 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"]]);
--- 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>
+<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>
--- 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);
--- 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"
  }
 }
--- 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>
+<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>
--- 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);
--- 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>
+<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>
--- 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 {
--- 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": {},
--- a/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner.png
--- a/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner2.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner2.png
--- a/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner3.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner3.png
--- a/unpackage/dist/dev/mp-weixin/static/images/bigImg/minebg.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/bigImg/minebg.png
--- a/unpackage/dist/dev/mp-weixin/static/images/okIcon.png
+++ b/unpackage/dist/dev/mp-weixin/static/images/okIcon.png
--- a/unpackage/dist/dev/mp-weixin/store/index.js
+++ 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;
--- 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
@ -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;
--- 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
@ -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);
--- 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
@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
--- 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
@ -0,0 +1 @@
+<text wx:if="{{a}}" class="{{[c, d, e, f, 'u-badge', 'data-v-06cca9b7']}}" style="{{g + ';' + h}}">{{b}}</text>
--- 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
@ -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;
+}