Merge remote-tracking branch 'origin/master'
# Conflicts: # pages/personal/personal.vue
This commit is contained in:
commit
f33b63b567
@ -20,7 +20,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<input class="righttext" style='left:23%' type="text" placeholder="请输入" maxlength="11" v-model="phonenumber"/>
|
<input class="righttext" style='left:23%' type="text" placeholder="请输入" maxlength="11" v-model="phonenumber"/>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
<!-- <view class="item">
|
||||||
<view class="lefttext">
|
<view class="lefttext">
|
||||||
验证码
|
验证码
|
||||||
</view>
|
</view>
|
||||||
@ -28,7 +28,7 @@
|
|||||||
<view class="obtaincode" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
|
<view class="obtaincode" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
|
||||||
{{getCodeText}}
|
{{getCodeText}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="loginbtn" @tap='pwdlogin'>
|
<view class="loginbtn" @tap='pwdlogin'>
|
||||||
登录
|
登录
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user