Merge pull request 'zmr' (#41) from zmr into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/41

pageA/login/login.vue

@@ -37,7 +37,7 @@
 			</view>
 			<!-- denglu QQ weixin -->
 			<view class="buttones">
-				<u-button @click="loginOn">{{login}}</u-button>
+				<view  @click="loginOn">{{login}}</view>
 			</view>
 			<u-mask :show="show" @click="show = false">
 				<view class="warp">
@@ -385,7 +385,7 @@
 		height: 22rpx;
 	}
 
-	.buttones .u-btn {
+	.buttones > view {
 		width: 628rpx;
 		height: 98rpx;
 		background: rgba(255, 120, 15, 1) !important;
@@ -393,10 +393,11 @@
 		margin: 0 auto;
 		font-size: 36rpx;
 		color: rgba(255, 255, 255, 1) !important;
-		line-height: 36px;
+		line-height: 98rpx;
 		border: 1px #ff780f solid;
 		outline: none;
 		border-color: rgba(255, 120, 15, 1) !important;
+		text-align: center;
 	}
 
 	.warp {

pageA/register/register.vue

@@ -36,7 +36,7 @@
 				<text class="other" @click="mask_u">其他方式登录</text>
 			</view>
 			<!-- denglu QQ weixin -->
-			<u-button @click="loginIn">{{login}}</u-button>
+			<view class="u-btn" @click="loginIn">{{login}}</view>
 			<u-mask :show="show" @click="show = false">
 				<view class="warp">
 					<view class="rect" @tap.stop>
@@ -238,7 +238,7 @@
 
 		.labales {
 			border-bottom: 1px #fff solid;
-			margin-bottom: 90rpx;
+			margin-bottom: 20rpx;
 			height: 70rpx;
 			line-height: 70rpx;
 			color: #fff;
@@ -267,28 +267,6 @@
 		letter-spacing: 2rpx;
 	}
 
-	.pact text {
-		font-size: 22rpx;
-		font-weight: 400;
-		color: rgba(255, 255, 255, 1);
-		line-height: 36px;
-	}
-
-	.pact_text {
-		font-size: 22px;
-		font-weight: 400;
-		color: rgba(129, 188, 253, 1) !important;
-		line-height: 36px;
-	}
-
-	//单选框的样式
-	.pact {
-		position: relative;
-		padding-left: 40rpx;
-		overflow: hidden; //超出的文本隐藏
-		text-overflow: ellipsis; //溢出用省略号显示
-		white-space: nowrap; //溢出不换行
-	}
 
 	.u-checkbox-group {
 		position: absolute;
@@ -312,10 +290,11 @@
 		margin: 0 auto;
 		font-size: 36rpx;
 		color: rgba(255, 255, 255, 1) !important;
-		line-height: 36px;
+		line-height: 98rpx;
 		border: 1px #ff780f solid;
 		outline: none;
 		border-color: rgba(255, 120, 15, 1) !important;
+		text-align: center;
 	}
 
 	.warp {
@@ -414,4 +393,32 @@
 		bottom: 0;
 		left: 0;
 	}
+	.pact text {
+		font-size: 22rpx;
+		font-weight: 400;
+		color: rgba(255, 255, 255, 1);
+		// line-height: 36px;
+	}
+	
+	.pact>view:first-child {
+		float: left;
+	
+	}
+	
+	.pact_text {
+		font-size: 22px;
+		font-weight: 400;
+		color: rgba(129, 188, 253, 1) !important;
+		// line-height: 36px;
+	}
+	
+	//单选框的样式
+	.pact {
+		position: relative;
+		padding-left: 40rpx;
+		overflow: hidden;
+		// overflow: hidden; //超出的文本隐藏
+		// text-overflow: ellipsis; //溢出用省略号显示
+		// white-space: nowrap; //溢出不换行
+	}
 </style>