diff --git a/pages/login/login.vue b/pages/login/login.vue
index ebc97d0..474c165 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,31 +1,96 @@
 <template>
 	<view class="page">
 		<view class="fixed">
-			<u-navbar title="登录" :border-bottom="false" :background="background" title-color='#CCC' title-size='36' back-icon-color='#CCC'
-				height='45'></u-navbar>
+			<u-navbar title="登录" :border-bottom="false" :background="background" title-color='#000' title-size='36'
+				back-icon-color='#000' height='45'></u-navbar>
 		</view>
 		<!-- <u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' height='45' >
 			
 		</u-navbar> -->
-		<view class="pages1" v-if="deptId==100">
+		<!-- <view class="pages1" v-if="deptId==100">
 			<view class="imgbox">
 				<image src="https://lxnapi.ccttiot.com/bike/img/static/uzg30jo8Mx7lgaRHFyiO" mode=""></image>
 			</view>
 			<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"   >
 				授权登录
 			</button>
-			<!-- <view class="button1"  @click="back">
+		
+		</view> -->
+		<view class="pages2" v-if="deptId==100&&pageindex==0">
+			<view class="imgbox">
+				<image src="https://lxnapi.ccttiot.com/bike/img/static/uX6A5Dlyr4lvGFNuqfPK" mode=""></image>
+			</view>
+			<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
+				style="margin-top: 30rpx;">
+				<image src="https://lxnapi.ccttiot.com/bike/img/static/uka0jHcbyy1we0qwbiov" mode=""></image> 微信登录
+			</button>
+			<view class="button" style="margin-top: 20rpx;" @click="pageindex=1">
+				<image src="https://lxnapi.ccttiot.com/bike/img/static/ubSJ6aNMOUfPf80iotGv" mode=""></image>授权登录
+			</view>
+			<!-- 	<view class="button1"  @click="back">
 				取消登录
 			</view> -->
 		</view>
+		<view class="page3" v-if="pageindex==1">
+			<view class="tit">
+				登录
+			</view>
+			<view class="tit_li" style="margin-top: 104rpx;">
+				<image src="https://lxnapi.ccttiot.com/bike/img/static/u3swF9YhZbUCuhGmrMrk" mode=""></image>
+				手机号
+			</view>
+			<view class="ipt">
+
+				<input type="number" class="ips" v-model="sn" placeholder=" 请输入您的手机号"
+					placeholder-style='font-weight: 400;font-size: 36rpx;color: #808080;' />
+			</view>
+			<view class="tit_li">
+				<image src="https://lxnapi.ccttiot.com/bike/img/static/ujOHD0RFCsOWAprtYLzj" mode=""
+					style="width: 50rpx;height: 54rpx;margin-right: 26rpx;"></image>
+				验证码
+			</view>
+			<view class="ipt">
+
+				<input type="number" class="ips" v-model="sn" placeholder=" 请输入您的手机号"
+					placeholder-style='font-weight: 400;font-size: 36rpx;color: #808080;' style="width: 60%;" />
+				<view class="send_code">
+					获取验证码
+				</view>
+			</view>
+			<view class="tit_li">
+				<image src="https://lxnapi.ccttiot.com/bike/img/static/uYkqUlpkl5VuksJhaPlW" mode=""
+					style="width: rpx;height: 54rpx;margin-right: 26rpx;"></image>
+				密码
+			</view>
+			<view class="ipt">
+
+				<input type="number" class="ips" v-model="sn" placeholder=" 请输入您的手机号"
+					placeholder-style='font-weight: 400;font-size: 36rpx;color: #808080;' />
+			</view>
+			<view class="sub_btn">
+				注册并登录
+			</view>
+			<view class="tips">
+				已有帐号？<span>立即登录</span>
+			</view>
+			<view class="line_box">
+				<view class="lines"></view>
+				其他登录方式
+				<view class="lines"></view>
+			</view>
+			<view class="wxbtn">
+				<image  src="https://lxnapi.ccttiot.com/bike/img/static/uUCvpOwGG8McfpYSUye4" mode=""></image>
+			</view>
+			
+		</view>
 		<view class="pages2" v-if="deptId==101">
 			<view class="imgbox">
 				<image src="https://lxnapi.ccttiot.com/bike/img/static/uX6A5Dlyr4lvGFNuqfPK" mode=""></image>
 			</view>
-			<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"   >
+			<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
 				授权登录
 			</button>
-		<!-- 	<view class="button1"  @click="back">
+			<!-- 	<view class="button1"  @click="back">
 				取消登录
 			</view> -->
 		</view>
@@ -43,11 +108,12 @@
 				bgc: {
 					backgroundColor: "#fff",
 				},
-				tittxt:"登录",
-				chooseType:true,
-				usertype:'',
-				login:false,
-				deptId:''
+				tittxt: "登录",
+				chooseType: true,
+				usertype: '',
+				login: false,
+				deptId: '',
+				pageindex: 1,
 			}
 		},
 		onLoad() {
@@ -55,74 +121,75 @@
 			// this.deptId = 101
 		},
 		methods: {
-			userType(num){
-				this.chooseType=false
-				this.login=true
-				if(num==1){
-					this.usertype='01'
-				}else{
-					this.usertype='00'
+			userType(num) {
+				this.chooseType = false
+				this.login = true
+				if (num == 1) {
+					this.usertype = '01'
+				} else {
+					this.usertype = '00'
 				}
 			},
-			back(){
+			back() {
 				uni.navigateBack({
 					delta: 1 // delta值为1时表示返回的页面层数
 				});
 			},
 			getPhoneNumber(e) {
-			    let that = this;
-			    console.log("eeeeeeee", e);
-			    const wxLoginAsync = () => {
-			        return new Promise((resolve, reject) => {
-			            wx.login({
-			                success(res) {
-			                    if (res.code) {
-			                        console.log('登录！', res);
-			                        let data = {
+				let that = this;
+				console.log("eeeeeeee", e);
+				const wxLoginAsync = () => {
+					return new Promise((resolve, reject) => {
+						wx.login({
+							success(res) {
+								if (res.code) {
+									console.log('登录！', res);
+									let data = {
 										jscode: res.code,
-			                            // userType: that.usertype,
-			                            mobileCode: e.detail.code,
-			                        };
-			                        resolve(data);
-			                    } else {
-			                        reject(res.errMsg);
-			                    }
-			                },
-			                fail(err) {
-			                    reject(err);
-			                }
-			            });
-			        });
-			    };
-			    wxLoginAsync()    
-			        .then(async (data) => {
-							let areaId=uni.getStorageSync('areaId'); 
-			            this.$u.post("/wxlogin?mobileCode="+data.mobileCode+'&jsCode='+data.jscode+'&areaId='+areaId).then((res) => {
-			            
-			            	
-			            	
-			            		
-			            		// this.$forceUpdate()
-			            	if (res.code == 200) {
-								console.log(res,'resres');
+										// userType: that.usertype,
+										mobileCode: e.detail.code,
+									};
+									resolve(data);
+								} else {
+									reject(res.errMsg);
+								}
+							},
+							fail(err) {
+								reject(err);
+							}
+						});
+					});
+				};
+				wxLoginAsync()
+					.then(async (data) => {
+						let areaId = uni.getStorageSync('areaId');
+						this.$u.post("/wxlogin?mobileCode=" + data.mobileCode + '&jsCode=' + data.jscode +
+							'&areaId=' + areaId).then((res) => {
+
+
+
+
+							// this.$forceUpdate()
+							if (res.code == 200) {
+								console.log(res, 'resres');
 								wx.setStorageSync('token', res.token);
 								that.ceshi()
 								// uni.switchTab({
 								// 	url: '/pages/index/index'
 								// })
-			            	}else{
+							} else {
 								uni.showToast({
 									title: res.msg,
 									icon: 'none',
 									duration: 2000
 								});
 							}
-			            });
-			           
-			        })
-			        .catch((err) => {
-			            console.error(err);
-			        });
+						});
+
+					})
+					.catch((err) => {
+						console.error(err);
+					});
 			},
 			async ceshi() {
 				this.$u.get("/getAppInfo").then((res) => {
@@ -136,30 +203,155 @@
 	}
 </script>
 
-<style lang="scss" >
-	page{
+<style lang="scss">
+	page {
 		background: #FFFFFF;
 	}
+
 	.page {
-		position: relative; /* 添加相对定位 */
+		position: relative;
+
+		/* 添加相对定位 */
 		.fixed {
 			z-index: 999;
 			position: fixed;
 			top: 0;
 		}
-		.pages1{
+
+		.page3 {
+
+			padding: 200rpx 60rpx 0 60rpx;
+
+			.line_box {
+				.lines {
+					width: 162rpx;
+					height: 0rpx;
+					border: 1rpx solid #D8D8D8;
+				}
+				margin-top: 134rpx;
+				width: 620rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: space-between;
+				font-weight: 400;
+				font-size: 32rpx;
+				color: #808080;
+			}
+			.wxbtn{
+				
+				width: 100%;
+				margin-top: 30rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				image{
+					height: 64rpx;
+					width:  64rpx;
+				}
+			
+			}
+			.tips {
+				width: 258rpx;
+				margin: 0 auto;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #50565A;
+
+				span {
+					text-decoration: underline;
+					text-underline-offset: 4rpx;
+					color: #64B6A8;
+				}
+			}
+
+			.sub_btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 80rpx auto 52rpx;
+				width: 620rpx;
+				height: 92rpx;
+				background: rgba(100, 182, 168, 0.5);
+				border-radius: 46rpx 46rpx 46rpx 46rpx;
+				font-weight: 500;
+				font-size: 40rpx;
+				color: #FFFFFF;
+			}
+
+			.tit {
+				width: 145rpx;
+				font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+				font-weight: 500;
+				font-size: 72rpx;
+				color: #3D3D3D;
+				color: #3D3D3D;
+
+				background: linear-gradient(0deg, #64B6A8 0.1%, rgba(255, 255, 255, 0) 30%), #FFFFFF;
+			}
+
+			.tit_li {
+				margin-top: 42rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				font-weight: 500;
+				font-size: 32rpx;
+				color: #64B6A8;
+
+				image {
+					margin-right: 30rpx;
+					width: 37rpx;
+					height: 56rpx;
+				}
+			}
+
+			.ipt {
+				padding-left: 8rpx;
+				margin-top: 42rpx;
+				width: 599rpx;
+				height: 80rpx;
+				background: #fff;
+				border-radius: 0rpx 0rpx 0rpx 0rpx;
+				border-bottom: 1rpx solid #D8D8D8;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.send_code {
+					margin-left: auto;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 158rpx;
+					height: 58rpx;
+					background: #64B6A8;
+					border-radius: 30rpx 30rpx 30rpx 30rpx;
+					font-weight: 500;
+					font-size: 24rpx;
+					color: #FFFFFF;
+				}
+
+				.ips {
+					width: 100%;
+				}
+			}
+		}
+
+		.pages1 {
 			.imgbox {
-				margin-top:0rpx ;
+				margin-top: 0rpx;
 				width: 750rpx;
 				height: 734rpx;
 				z-index: 0;
-			
+
 				image {
 					width: 750rpx;
 					height: 734rpx;
 				}
 			}
-			.button{
+
+			.button {
 				margin-top: 200rpx;
 				width: 586rpx;
 				height: 90rpx;
@@ -169,7 +361,8 @@
 				font-size: 40rpx;
 				color: #FFFFFF;
 			}
-			.button1{
+
+			.button1 {
 				margin: 72rpx auto;
 				display: flex;
 				align-items: center;
@@ -184,29 +377,42 @@
 				color: #4C97E7;
 			}
 		}
-		.pages2{
+
+		.pages2 {
 			.imgbox {
-				margin-top:0rpx ;
+				margin-top: 0rpx;
 				width: 750rpx;
 				height: 1274rpx;
 				z-index: 0;
-			
+
 				image {
 					width: 750rpx;
 					height: 1274rpx;
 				}
 			}
-			.button{
+
+			.button {
+				margin: 0 auto;
+				display: flex;
+				align-items: center;
+				justify-content: center;
 				margin-top: 100rpx;
 				width: 586rpx;
 				height: 90rpx;
-				background: #4C97E7;
+				background: #64B6A8;
 				border-radius: 54rpx 54rpx 54rpx 54rpx;
 				font-weight: 500;
 				font-size: 40rpx;
 				color: #FFFFFF;
+
+				image {
+					margin-right: 10rpx;
+					width: 56rpx;
+					height: 46rpx;
+				}
 			}
-			.button1{
+
+			.button1 {
 				margin: 72rpx auto;
 				display: flex;
 				align-items: center;
@@ -219,13 +425,13 @@
 				font-weight: 500;
 				font-size: 40rpx;
 				color: #4C97E7;
-			} 
+			}
 		}
-		
+
 	}
-	
-	.tip{
-		margin-top:128rpx ;
+
+	.tip {
+		margin-top: 128rpx;
 		display: flex;
 		flex-wrap: nowrap;
 		align-items: center;
@@ -233,11 +439,10 @@
 		font-weight: 400;
 		font-size: 20rpx;
 		color: #979797;
-		image{
+
+		image {
 			width: 26rpx;
 			height: 26rpx;
 		}
 	}
-
-	
-</style>
+</style>
\ No newline at end of file
diff --git a/pages_admin/worke/AccountDetails.vue b/pages_admin/worke/AccountDetails.vue
index 54ff7cf..8cc2273 100644
--- a/pages_admin/worke/AccountDetails.vue
+++ b/pages_admin/worke/AccountDetails.vue
@@ -166,6 +166,10 @@
 					return '骑行订单退款'
 				} else if (type == 5) {
 					return '提现'
+				} else if (type == 6) {
+					return '提现失败'
+				}else if (type == 7) {
+					return '车损收入'
 				}
 			
 			},
@@ -227,7 +231,10 @@
 				
 			},
 			getareaInfo() {
-				this.$u.get('/appVerify/getDept').then((res) => {
+				let data={
+					areaId: this.areaId
+				}
+				this.$u.get('/appVerify/getDept',data).then((res) => {
 					if (res.code == 200) {
 						this.info=res.data
 					}