merge

pages/login/login.vue

@@ -26,8 +26,11 @@
 			</view>
 		</view>
 		<!-- 用户登录注册协议 -->
-		<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<navigator url="">用户隐私规格</navigator>和<navigator url="">用户服务协议
-			</navigator>
+		<view class="agreement">
+			未注册的手机号验证后将自动创建账号，登录即表示同意接收
+			<view @click="$Router.push({name: 'agreement', params: {name : 'secret'}})">用户隐私协议</view>
+			和
+			<view @click="$Router.push({name: 'agreement', params: {name : 'service'}})">用户服务协议</view>
 		</view>
 	</view>
 </template>
@@ -210,7 +213,7 @@
 		}
 
 		.btn {
-			background: $mian-color;
+			background-image: linear-gradient(to bottom,#bf52eb,#8f32dd);
 			color: white;
 			border-radius: 0;
 			margin-top: $margin;
@@ -224,7 +227,7 @@
 			}
 
 			&[disabled] {
-				background: rgba($color: $mian-color, $alpha: .6);
+				background: rgba($color: #8f32dd, $alpha: .6);
 			}
 		}
 
@@ -253,8 +256,7 @@
 			padding-top: $padding * 2;
 			font-size: $title-size-sm;
 			color: $text-gray;
-
-			navigator {
+			view {
 				color: $text-price;
 				display: inline-block;
 				padding: 0 10rpx;