Skip to content

J
junlebao-milk-20240619
Commit 58d06a09 authored by 俞嘉婷's avatar 俞嘉婷
Browse files
Options

feat: 默认头像昵称逻辑

parent 72e05250
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
miniprogram/pages/index/index.ts
View file @ 58d06a09
...@@ -23,7 +23,7 @@ ComponentWithStore({ ...@@ -23,7 +23,7 @@ ComponentWithStore({
showAlGetPanel: false, showAlGetPanel: false,
showPhoneBtn: false, showPhoneBtn: false,
userInfo: { userInfo: {
avatarUrl: defaultInfo.avatar, avatarUrl: '',
nickName: '', nickName: '',
}, },
canIUseGetUserProfile: wx.canIUse('getUserProfile'), canIUseGetUserProfile: wx.canIUse('getUserProfile'),
...@@ -88,7 +88,7 @@ ComponentWithStore({ ...@@ -88,7 +88,7 @@ ComponentWithStore({
showAlGetPanel: channel && !first && !store.paramsObj.channel, showAlGetPanel: channel && !first && !store.paramsObj.channel,
showPhoneBtn: false, showPhoneBtn: false,
userInfo: { userInfo: {
avatarUrl: store.homeInfo.avatar || defaultInfo.avatar, avatarUrl: store.homeInfo.avatar,
nickName: store.homeInfo.nickname, nickName: store.homeInfo.nickname,
}, },
}); });
......
miniprogram/pages/index/index.wxml
View file @ 58d06a09
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
</swiper> </swiper>
<view class="user_info"> <view class="user_info">
<block wx:if="{{canIUseNicknameComp}}"> <block wx:if="{{canIUseNicknameComp}}">
<button wx:if="{{!userInfo.avatarUrl || userInfo.avatarUrl == defaultInfo.avatar}}" class="avatar_box" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar"> <button wx:if="{{!userInfo.avatarUrl}}" class="avatar_box" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
<image class="avatar" src="{{userInfo.avatarUrl}}"></image> <image class="avatar" src="{{userInfo.avatarUrl || defaultInfo.avatar}}"></image>
</button> </button>
<view wx:else class="avatar_box"> <view wx:else class="avatar_box">
<image class="avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image> <image class="avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<text class="nickname lineClamp1">{{userInfo.nickName}}</text> <text class="nickname lineClamp1">{{userInfo.nickName}}</text>
</block> </block>
</block> </block>
<!-- <block wx:elif="{{!userInfo.avatarUrl || userInfo.avatarUrl == defaultInfo.avatar || !userInfo.nickName}}"> <!-- <block wx:elif="{{!userInfo.avatarUrl || !userInfo.nickName}}">
<button wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile">获取头像昵称</button> <button wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile">获取头像昵称</button>
<view wx:else>请使用2.10.4及以上版本基础库</view> <view wx:else>请使用2.10.4及以上版本基础库</view>
</block> --> </block> -->
......
miniprogram/pages/my/my.ts
View file @ 58d06a09
...@@ -11,8 +11,8 @@ ComponentWithStore({ ...@@ -11,8 +11,8 @@ ComponentWithStore({
data: { data: {
defaultInfo: defaultInfo, defaultInfo: defaultInfo,
userInfo: { userInfo: {
avatarUrl: defaultInfo.avatar, avatarUrl: '',
nickName: defaultInfo.nickname, nickName: '',
}, },
canIUseGetUserProfile: wx.canIUse('getUserProfile'), canIUseGetUserProfile: wx.canIUse('getUserProfile'),
canIUseNicknameComp: wx.canIUse('input.type.nickname'), canIUseNicknameComp: wx.canIUse('input.type.nickname'),
...@@ -22,8 +22,8 @@ ComponentWithStore({ ...@@ -22,8 +22,8 @@ ComponentWithStore({
store.doLog(507, 11) store.doLog(507, 11)
this.setData({ this.setData({
userInfo: { userInfo: {
avatarUrl: store.homeInfo.avatar || defaultInfo.avatar, avatarUrl: store.homeInfo.avatar,
nickName: store.homeInfo.nickname || defaultInfo.nickname, nickName: store.homeInfo.nickname,
}, },
}); });
}, },
......
miniprogram/pages/my/my.wxml
View file @ 58d06a09
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<view class="mine_logo"></view> <view class="mine_logo"></view>
<view class="user_info"> <view class="user_info">
<block wx:if="{{canIUseNicknameComp}}"> <block wx:if="{{canIUseNicknameComp}}">
<button wx:if="{{!userInfo.avatarUrl || userInfo.avatarUrl == defaultInfo.avatar}}" class="avatar_box" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar"> <button wx:if="{{!userInfo.avatarUrl}}" class="avatar_box" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
<image class="avatar" src="{{userInfo.avatarUrl}}"></image> <image class="avatar" src="{{userInfo.avatarUrl || defaultInfo.avatar}}"></image>
</button> </button>
<view wx:else class="avatar_box"> <view wx:else class="avatar_box">
<image class="avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image> <image class="avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<text class="nickname lineClamp1">{{userInfo.nickName}}</text> <text class="nickname lineClamp1">{{userInfo.nickName}}</text>
</block> </block>
</block> </block>
<!-- <block wx:elif="{{!userInfo.avatarUrl || userInfo.avatarUrl == defaultInfo.avatar || !userInfo.nickName}}"> <!-- <block wx:elif="{{!userInfo.avatarUrl || !userInfo.nickName}}">
<button wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile">获取头像昵称</button> <button wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile">获取头像昵称</button>
<view wx:else>请使用2.10.4及以上版本基础库</view> <view wx:else>请使用2.10.4及以上版本基础库</view>
</block> --> </block> -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment