diff --git a/pages/login/index.vue b/pages/login/index.vue
index 6c85e2b..3b162f7 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -1,33 +1,45 @@
 <template>
+
 	<view class="logo-v">
-		<view class="login-bg">
-			<image src="/static/login-bg.png" mode="widthFix"></image>
-		</view>
-		<view class="logo-hd u-flex-col" style="">
-		 
-			<view class="u-flex-col introduce u-m-t-30">
-				<!-- <text class="u-font-36 text-one" style="">一丰大药房</text> -->
-				<!-- <text class="u-font-24 text-two">表单采集</text> -->
+		<view class="t-login">
+			<!-- 页面装饰图片 -->
+			<image class="img-a" src="@/static/2.png"></image>
+			<image class="img-b" src="@/static/3.png"></image>
+			<!-- 标题 -->
+			<view class="t-b">
+				<image src="../../static/logo.png" mode="widthFix" style="width: 90%;">
+				</image>
 			</view>
-			<view class="loginSwitch u-flex-col">
-				<view class="loginInputBox u-flex-col">
-					<u-form :model="formData" :rules="rules" ref="dataForm" :errorType="['toast']" label-position="left"
-						label-width="150" label-align="left">
-						<u-form-item prop="account">
-							<u-input v-model="formData.account" placeholder="请输入帐号"></u-input>
-						</u-form-item>
-						<u-form-item prop="password">
-							<u-input v-model="formData.password" type="password" placeholder="请输入密码"></u-input>
-						</u-form-item>
-					</u-form>
-					<view class="loginBtnBox u-m-t-64">
-						<u-button @click="login" type="primary" :loading="loading">{{ loading ? "登录中...":"登录"}}
-						</u-button>
+			<u-form :model="formData" :rules="rules" ref="dataForm" :errorType="['toast']" label-position="left"
+				label-width="150" label-align="left">
+
+				<u-form-item prop="account">
+					<view class="t-a">
+						<image src="@/static/sj.png"></image>
+						<input placeholder="请输入帐号" v-model="formData.account" />
+					</view>
+				</u-form-item>
+				<u-form-item prop="password">
+					<view class="t-a">
+						<image src="@/static/yz.png"></image>
+						<input placeholder="请输入密码" type="password" v-model="formData.password" />
 					</view>
+				</u-form-item>
+			</u-form>
+			<u-button @click="login" type="primary" :loading="loading">{{ loading ? "登录中...":"登录"}}
+			</u-button>
+
+			<!-- 	<view class="t-f"><text>————— 第三方账号登录 —————</text></view>
+			<view class="t-e cl">
+				<view class="t-g" @tap="wxLogin()">
+					<image src="@/static/wx.png"></image>
 				</view>
-			</view>
+				<view class="t-g" @tap="zfbLogin()">
+					<image src="@/static/qq.png"></image>
+				</view>
+			</view> -->
 		</view>
-		<!-- <view class="copyright">Copyright © 2023 一丰大药房</view> -->
+
 	</view>
 </template>
 
@@ -87,53 +99,51 @@
 						// 	duration:'2000'
 						// })
 						request({
-							url:'/api/oauth/Login1',
-							method:'post',
-							data:query,
-							header:{
+							url: '/api/oauth/Login1',
+							method: 'post',
+							data: query,
+							header: {
 								"Content-Type": "application/x-www-form-urlencoded"
 							}
 						}).then(res => {
-						// this.API.userLogin(query).then(res => {
-							console.log('登录信息',res)
+							// this.API.userLogin(query).then(res => {
+							console.log('登录信息', res)
 							uni.showToast({
-								title:'denglu',
-								duration:'2000'
+								title: 'denglu',
+								duration: '2000'
 							})
-							
-							if(res.code === 200){
+
+							if (res.code === 200) {
 								let token = res.data.token
 								// let user = res.data.user
-								console.log('token',token)
+								console.log('token', token)
 								this.$store.commit('user/SET_TOKEN', token)
 								uni.setStorageSync('AuthToken_KEY', token)
 								uni.setStorageSync('token', token)
-								// uni.switchTab({
-								// 	url: '/pages/index/apply'
-								// });
-								that.API.getUserInfo().then(res=>{
+
+								that.API.getUserInfo().then(res => {
 									console.log(res)
-									
+
 									let user = res.data
-									uni.setStorageSync('user',user)
-									if(uni.getStorageSync('user')){
+									uni.setStorageSync('user', user)
+									if (uni.getStorageSync('user')) {
 										this.loading = false
 										uni.showToast({
-											icon:"success",
-											title:"登陆成功"
+											icon: "success",
+											title: "登陆成功"
 										})
 										uni.switchTab({
 											url: '/pages/home/home'
 										});
 									}
-									
-									
+
+
 								})
-								
-							}else{
+
+							} else {
 								uni.showToast({
-									icon:"error",
-									title:res.msg
+									icon: "error",
+									title: res.msg
 								})
 								this.loading = false
 							}
@@ -147,108 +157,139 @@
 				});
 			},
 		},
-		
+
 	}
 </script>
 
 <style lang="scss">
-	page {}
+	.logo-v {}
 
-	.logo-v {
-		.login-bg {
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.logo-hd {
-			width: 100%;
-			position: absolute;
-			top: 200rpx;
-
-			.logoImg {
-				width: 160rpx;
-				height: 160rpx;
-				margin: 0 auto;
-
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 20%;
-				}
-			}
+	.img-a {
+		position: absolute;
+		width: 100%;
+		top: -280rpx;
+		right: -100rpx;
+	}
 
-			.introduce {
-				justify-content: center;
-				align-items: center;
+	.img-b {
+		position: absolute;
+		width: 50%;
+		bottom: 0;
+		left: -50rpx;
+		margin-bottom: -200rpx;
+	}
 
-				.text-one {
-					height: 70rpx;
-					font-weight: 700;
-				}
+	.t-login {
+		width: 600rpx;
+		margin: 0 auto;
+		font-size: 28rpx;
+		color: #000;
+	}
 
-				.text-two {
-					color: #999999;
-				}
-			}
-		}
-
-		.loginSwitch {
-			margin-top: 40rpx;
-			justify-content: center;
-			align-items: center;
-
-			.tabs {
-				color: #999999;
-				position: relative;
-
-				&::after {
-					content: "";
-					width: 64rpx;
-					height: 4rpx;
-					background-color: #356efe;
-					margin-top: 15rpx;
-					position: absolute;
-					left: 0;
-					bottom: -15rpx;
-					display: block;
-					border-radius: 50rpx;
-				}
+	.t-login button {
+		font-size: 28rpx;
+		background: #ff0000;
+		color: #fff;
+		height: 90rpx;
+		line-height: 90rpx;
+		border-radius: 50rpx;
+		box-shadow: 0 5px 7px 0 rgba(86, 119, 252, 0.2);
+	}
 
-				// &.active1 {
-				// 	&::after {
-				// 		left: 0;
-				// 	}
-				// }
+	.t-login input {
+		padding: 0 20rpx 0 120rpx;
+		height: 90rpx;
+		line-height: 90rpx;
+		margin-bottom: 50rpx;
+		background: #f8f7fc;
+		border: 1px solid #e9e9e9;
+		font-size: 28rpx;
+		border-radius: 50rpx;
+	}
 
-				&.active2 {
-					&::after {
-						left: 70%;
-					}
-				}
+	.t-login .t-a {
+		position: relative;
+		width: 100%
+	}
 
-				.tab {
-					width: 50%;
-					height: 80upx;
-					text-align: center;
-					color: #AEAFB5;
-					font-size: 32upx;
+	.t-login .t-a image {
+		width: 40rpx;
+		height: 40rpx;
+		position: absolute;
+		left: 40rpx;
+		top: 28rpx;
+		border-right: 2rpx solid #dedede;
+		padding-right: 20rpx;
+	}
 
-					&.active {
-						color: #3281ff;
-					}
-				}
+	.t-login .t-b {
+		text-align: left;
+		font-size: 46rpx;
+		color: #000;
+		padding: 300rpx 0 40rpx 0;
+		font-weight: bold;
+	}
 
-			}
+	.t-login .t-c {
+		position: absolute;
+		right: 22rpx;
+		top: 22rpx;
+		background: #ff0000;
+		color: #fff;
+		font-size: 24rpx;
+		border-radius: 50rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		padding: 0 25rpx;
+	}
 
-			.loginInputBox {
-				width: 100%;
-				margin-top: 80rpx;
-				padding: 0 64rpx;
+	.t-login .t-d {
+		text-align: center;
+		color: #999;
+		margin: 80rpx 0;
+	}
 
-				.loginBtnBox {}
-			}
-		}
+	.t-login .t-e {
+		text-align: center;
+		width: 250rpx;
+		margin: 80rpx auto 0;
+	}
+
+	.t-login .t-g {
+		float: left;
+		width: 50%;
+	}
+
+	.t-login .t-e image {
+		width: 50rpx;
+		height: 50rpx;
+	}
+
+	.t-login .t-f {
+		text-align: center;
+		margin: 200rpx 0 0 0;
+		color: #666;
+	}
+
+	.t-login .t-f text {
+		margin-left: 20rpx;
+		color: #aaaaaa;
+		font-size: 27rpx;
+	}
+
+	.t-login .uni-input-placeholder {
+		color: #000;
+	}
+
+	.cl {
+		zoom: 1;
+	}
+
+	.cl:after {
+		clear: both;
+		display: block;
+		visibility: hidden;
+		height: 0;
+		content: '\20';
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/official/official.vue b/pages/official/official.vue
index eef58a7..1e82a22 100644
--- a/pages/official/official.vue
+++ b/pages/official/official.vue
@@ -63,12 +63,12 @@
 					url: 'http://deyanggaoxin.fengshiyun.com/api/file/Uploader/1', // 不传入上传地址则返回本地链接
 					// url: '', // 不传入上传地址则返回本地链接
 				},
-				check:false,
+				check: false,
 				// 文件名
 				fileName: '文件名',
 				// 当前用户ID:
 				userId: '',
-				isAdmin:false
+				isAdmin: false
 			}
 		},
 		onShow() {
@@ -82,10 +82,10 @@
 
 		},
 		methods: {
-			change(){
-				console.log('check',this.check)
+			change() {
+				console.log('check', this.check)
 				this.check = !this.check
-				console.log('check',this.check)
+				console.log('check', this.check)
 			},
 			// 获取用户信息
 			getUser() {
@@ -96,7 +96,7 @@
 					this.userName = userCode.userInfo.userAccount
 					this.userIcon = userCode.userInfo.headIcon
 					this.organizeName = userCode.userInfo.organizeName
-					if(this.userId === 'admin'){
+					if (this.userId === 'admin') {
 						this.isAdmin = true
 					}
 					console.log(userCode)
@@ -114,9 +114,9 @@
 			},
 
 			// 跳转到自定义分组页面
-			toGrouping(){
+			toGrouping() {
 				uni.navigateTo({
-					url:'/pages/official/grouping/grouping'
+					url: '/pages/official/grouping/grouping'
 				})
 			},
 			// 获取企业分类
@@ -352,7 +352,7 @@
 					}).then(res => {
 						console.log(res)
 						if (res.code === 200) {
-							if(this.check){
+							if (this.check) {
 								this.tellNotice()
 							}
 							uni.showToast({
@@ -371,19 +371,19 @@
 
 			},
 			// 进行通知
-			tellNotice(){
+			tellNotice() {
 				// 进行通知
 				request({
-					url:'/api/extend/demo/SendMessageByApp',
-					method:'post',
-					data:{
-						title:'公文消息',
-						companys:'公文消息，请及时查看！',
-						desc:this.noticeDesc,
-						fangshi:'通知'
+					url: '/api/extend/demo/SendMessageByApp',
+					method: 'post',
+					data: {
+						title: '公文消息',
+						companys: '公文消息，请及时查看！',
+						desc: this.noticeDesc,
+						fangshi: '通知'
 					}
-				}).then(res=>{
-					console.log('通知结果',res)
+				}).then(res => {
+					console.log('通知结果', res)
 				})
 			},
 			getCityNames(ids) {