Sfoglia il codice sorgente

Merge branch 'master' into wxl

lex-xin 5 anni fa
parent
commit
3aca1a5812
1 ha cambiato i file con 14 aggiunte e 6 eliminazioni
  1. 14 6
      src/views/signup/SignUpAccount.vue

+ 14 - 6
src/views/signup/SignUpAccount.vue

@@ -19,14 +19,13 @@
 			<van-checkbox v-model="agreeStatus"></van-checkbox>
 			<i style="font-style: normal;" @click="agreeStatus = !agreeStatus">已阅读并同意</i> <span @click="onToProtocol">《酷乐秀用户注册服务协议》</span>
 		</div>
-		<m-button class="stepBtn" text="下一步" @click="onSubmit" native-type="submit" />
+		<van-button type="primary" :disabled="!agreeStatus" @click="onSubmit" round block>下一步</van-button>
 		<!-- </van-form> -->
 	</div>
 </template>
 <script>
 	import MHeader from '@/components/MHeader'
 	import MStep from '@/components/MStep'
-	import MButton from '@/components/MButton'
 	// import { browser } from '@/common/common'
 	import {
 		patternPhone
@@ -41,8 +40,7 @@
 		name: 'signUpAccount',
 		components: {
 			MHeader,
-			MStep,
-			MButton
+			MStep
 		},
 		data() {
 			localStorage.removeItem("Authorization")
@@ -162,7 +160,7 @@
 					return
 				}
 				if(!this.agreeStatus) {
-					this.$toast('请先阅读并同意用户协议')
+					this.$toast('请先阅读并同意酷乐秀用户注册服务协议')
 					return
 				}
 				// 验证码
@@ -251,7 +249,17 @@
 				color: @--main-color;
 			}
 		}
-		
+		.van-button--primary {
+			margin: .16rem 0 .18rem;
+			background-color: @--main-color;
+			border: 1px solid @--main-color;
+			color: #FFFFFF;
+			font-size: .18rem;
+			height: .5rem;
+			line-height: .52rem;
+			width: 90%;
+			margin-left: 5%;
+		}
 		.stepBtn {
 			margin-top: .15rem;
 		}