auto commit

pages/getin/getin.scss

@@ -72,6 +72,9 @@
 				// height: 81rpx;
 				// line-height: 81rpx;
 			}
+			/deep/ .uni-input-placeholder{
+				top: 25%!important;
+			}
 		}
 		.u-btn{
 			height: 81rpx;

pages/index/index.vue

@@ -95,7 +95,7 @@
 	export default {
 		data() {
 			return {
-				pic:'https://uviewui.com/common/logo.png',
+				pic:'/static/img/default-portrait.png',
 				userInfo:[],
 				noticeList:['智慧停车车主端V0.1版本发布','智慧停车PDA端V0.1版本发布'],
 				theRoad:[],

pages/login/login.scss

@@ -34,14 +34,28 @@
 	}
 }
 .login-btn{
+	position: relative;
 	height: 118rpx;
-	line-height: 100rpx;
-	background: url(../../static/img/login-btn.png) no-repeat;
+	line-height: 118rpx;
+	// background: #6BDAED url(../../static/img/login-btn.png) no-repeat;
+	background-color: #6BDAED;
 	background-size: contain;
 	text-align: center;
 	font-size: 32rpx;
 	letter-spacing: 1px;
 	color: #fff;
+	border-radius: 80rpx;
+	overflow: hidden;
+	&::after{
+		content: '';
+		width: 40%;
+		height: 100%;
+		background-color: #78E0F1;
+		position: absolute;
+		right: -8%;
+		bottom: 0;
+		transform: skewX(310deg);
+	}
 }
 
 .pages{

pages/modifypwd/modifypwd.scss

@@ -0,0 +1,8 @@
+page{background-color: #F4F4F4;}
+.modifypwd .u-form-item{
+	background-color: #fff;padding-left: 40rpx;padding-right: 40rpx;
+	/deep/ .uni-input-placeholder{
+		top: 25%!important;
+	}
+}
+.modifypwd .submit-btn{background-color: #3397FA;color: #fff;border: 0;margin: 274rpx 40rpx 40rpx;}

pages/modifypwd/modifypwd.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="modifypwd">
 		<u-navbar
 		 title="修改密码" 
 		 title-color="#fff" 
@@ -72,9 +72,6 @@
 	}
 </script>
 
-<style lang="scss" scoped>
-	page{background-color: #F4F4F4;}
-	.u-form-item{background-color: #fff;padding-left: 40rpx;padding-right: 40rpx;}
-	.submit-btn{background-color: #3397FA;color: #fff;border: 0;margin: 274rpx 40rpx 40rpx;}
-	// @import "./modifypwd.scss";
+<style lang="scss">
+	@import "./modifypwd.scss";
 </style>

pages/setting/setting.vue

@@ -23,6 +23,7 @@
 			</u-cell-group>
 		</view>
 		
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -74,13 +75,24 @@
 					   if (res.confirm) {
 							  this.$u.api.loginOut({})
 							  .then(res=>{
-									uni.showToast({
-										title: '退出成功',
-										duration: 2000
-									});
-							  	uni.redirectTo({
-							  		url:'../login/login'
-							  	});
+								  uni.clearStorage();
+								  this.$u.vuex('vuex_token', null);
+								  this.$u.vuex('vuex_user', null);
+								  this.$u.vuex('vuex_hasLogin', false);
+								  this.userInfo = [];
+								  this.theRoad = [];
+								  this.$refs.uToast.show({
+								  	title: '退出成功,即将跳转登录页!',
+								  	type: 'success',
+								  	url:'pages/login/login'
+								  });
+									// uni.showToast({
+									// 	title: '退出成功',
+									// 	duration: 2000
+									// });
+									// uni.redirectTo({
+									// 	url:'../login/login'
+									// });
 							  }).catch(err=>{
 								  uni.showToast({
 								  	title: '退出失败',