Merge remote-tracking branch 'origin/feature/mall_product'

pull/2/head
Jruome 2023-05-29 18:29:01 +08:00
commit b33fcd347e
2 changed files with 6 additions and 6 deletions

View File

@ -38,7 +38,7 @@
<u-button class="logon" @click="loginMobile" v-if="current !== 0" :loading="loading" loading-text="登录中" :disabled="loading"></u-button>
<u-button class="logon" @click="submit" v-if="current === 0" :loading="loading" loading-text="登录中" :disabled="loading"></u-button>
<div class="tips">
<div @click="jumpRegister"></div>
<!-- <div @click="jumpRegister"></div> -->
<div @click="current = current === 1 ? 0 : 1">{{ current === 1 ? '账号密码登录' : '短信验证码登录' }}</div>
<div @click="jumpRetrievePassword"></div>
</div>

View File

@ -18,16 +18,16 @@
<view class='item acea-row row-between-wrapper'>
<view>手机号码</view>
<navigator url="/pages/users/app_login/index" hover-class="none" class="input"
v-if="!userInfo.phone">
v-if="!userInfo.mobile">
点击绑定手机号<text class="iconfont icon-xiangyou"></text>
</navigator>
<navigator url="/pages/users/user_phone/index" hover-class="none" class="input" v-else>
<view class="input" v-else>
<view class='input acea-row row-between-wrapper'>
<input type='text' disabled='true' name='phone' :value='userInfo.phone'
<input type='text' disabled='true' name='phone' :value='userInfo.mobile'
class='id'></input>
<text class='iconfont icon-xiangyou'></text>
<text class='iconfont icon-suozi'></text>
</view>
</navigator>
</view>
<!-- <navigator url="/pages/users/user_phone/index" hover-class="none" class="input" v-if="!memberInfo.phone">
点击绑定手机号<text class="iconfont icon-xiangyou"></text>
</navigator>