Showing
1 changed file
with
8 additions
and
8 deletions
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | <view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30"> |
| 9 | 9 | <block v-if="userInfo.isToken"> |
| 10 | 10 | <view @click="openPersonalInfo" class="u-m-r-20"> |
| 11 | - <image class="avatar" mode="aspectFill" :src="userInfo.avatar || userInfo.avatarUrl || '/static/default.png'"></image> | |
| 11 | + <image class="avatar" mode="aspectFill" :src="userInfo.avatar == '' ? '/static/default.png' : userInfo.avatar"></image> | |
| 12 | 12 | </view> |
| 13 | 13 | <view @click="openPersonalInfo" class="u-flex-1"> |
| 14 | 14 | <view class="nickName u-flex"> |
| ... | ... | @@ -22,11 +22,11 @@ |
| 22 | 22 | </block> |
| 23 | 23 | <block v-else> |
| 24 | 24 | <view class="u-m-r-20" @click="openLoginFunc"> |
| 25 | - <view class="avatar u-flex"><u-icon name="account-fill" color="black" size="30"></u-icon></view> | |
| 25 | + <view class="avatar u-flex"><image class="avatar" mode="aspectFill" src="../../static/default.png"></image></view> | |
| 26 | 26 | </view> |
| 27 | 27 | <view class="u-flex-1"> |
| 28 | 28 | <view @click="openLoginFunc" class="u-font-lg click-login login-btn ">请点击登录</view> |
| 29 | - <view @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view> | |
| 29 | + <view v-if="userInfo.isToken == '' || userInfo.isToken == null" @click="clickAccountFunc" class="detail"><text class="text">绑定账号</text></view> | |
| 30 | 30 | </view> |
| 31 | 31 | </block> |
| 32 | 32 | <view v-if="userInfo.isToken"><u-icon name="arrow-right" color="white" size="13"></u-icon></view> |
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | </view> |
| 56 | 56 | <view class="u-flex-1"> |
| 57 | 57 | <view @click="openLoginFunc" class="u-font-lg login-btn">登录</view> |
| 58 | - <view @click="clickAccountFunc" style="color: black" class="detail">绑定账号</view> | |
| 58 | + <view v-if="userInfo.isToken == '' || userInfo.isToken == null" @click="clickAccountFunc" style="color: black" class="detail">绑定账号</view> | |
| 59 | 59 | </view> |
| 60 | 60 | </block> |
| 61 | 61 | <view><u-icon name="arrow-right" color="black" size="13"></u-icon></view> |
| ... | ... | @@ -75,8 +75,8 @@ |
| 75 | 75 | <view class="nav-right"><image class="image" src="../../static/arrow-right.png"></image></view> |
| 76 | 76 | </view> |
| 77 | 77 | </view> |
| 78 | - <view v-if="userInfo.isToken" class="u-flex" style="justify-content: center; width: 600rpx"> | |
| 79 | - <button class="submit" size="default" @click.top="onLoginoutFunc"><text class="text">退出账号</text></button> | |
| 78 | + <view @click="onLoginoutFunc" v-if="userInfo.isToken" class="u-flex" style="justify-content: center; width: 600rpx"> | |
| 79 | + <button class="submit" size="default" @click="onLoginoutFunc"><text class="text">退出账号</text></button> | |
| 80 | 80 | </view> |
| 81 | 81 | </view> |
| 82 | 82 | <!-- 绑定账号 --> |
| ... | ... | @@ -191,8 +191,8 @@ export default { |
| 191 | 191 | onLoad(e) { |
| 192 | 192 | // 隐藏原生的tabbar |
| 193 | 193 | uni.hideTabBar(); |
| 194 | - if (e.obj !== null) { | |
| 195 | - const params = JSON.parse(e.obj); | |
| 194 | + if (e.obj != null) { | |
| 195 | + const params = JSON.parse(decodeURIComponent(e.obj)); | |
| 196 | 196 | this.thirdObj = params; |
| 197 | 197 | } |
| 198 | 198 | }, | ... | ... |