feat: 默认头像昵称逻辑

miniprogram/pages/index/index.ts

@@ -23,7 +23,7 @@ ComponentWithStore({
         showAlGetPanel: false,
         showPhoneBtn: false,
         userInfo: {
-            avatarUrl: defaultInfo.avatar,
+            avatarUrl: '',
             nickName: '',
         },
         canIUseGetUserProfile: wx.canIUse('getUserProfile'),
@@ -88,7 +88,7 @@ ComponentWithStore({
                     showAlGetPanel: channel && !first && !store.paramsObj.channel,
                     showPhoneBtn: false,
                     userInfo: {
-                        avatarUrl: store.homeInfo.avatar || defaultInfo.avatar,
+                        avatarUrl: store.homeInfo.avatar,
                         nickName: store.homeInfo.nickname,
                     },
                 });

miniprogram/pages/index/index.wxml

@@ -7,8 +7,8 @@
   </swiper>
   <view class="user_info">
     <block wx:if="{{canIUseNicknameComp}}">
-      <button wx:if="{{!userInfo.avatarUrl || userInfo.avatarUrl == defaultInfo.avatar}}" class="avatar_box" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
-        <image class="avatar" src="{{userInfo.avatarUrl}}"></image>
+      <button wx:if="{{!userInfo.avatarUrl}}" class="avatar_box" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
+        <image class="avatar" src="{{userInfo.avatarUrl || defaultInfo.avatar}}"></image>
       </button>
       <view wx:else class="avatar_box">
         <image class="avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
@@ -20,7 +20,7 @@
         <text class="nickname lineClamp1">{{userInfo.nickName}}</text>
       </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>
       <view wx:else>请使用2.10.4及以上版本基础库</view>
     </block> -->

miniprogram/pages/my/my.ts

@@ -11,8 +11,8 @@ ComponentWithStore({
   data: {
     defaultInfo: defaultInfo,
     userInfo: {
-      avatarUrl: defaultInfo.avatar,
-      nickName: defaultInfo.nickname,
+      avatarUrl: '',
+      nickName: '',
     },
     canIUseGetUserProfile: wx.canIUse('getUserProfile'),
     canIUseNicknameComp: wx.canIUse('input.type.nickname'),
@@ -22,8 +22,8 @@ ComponentWithStore({
       store.doLog(507, 11)
       this.setData({
         userInfo: {
-          avatarUrl: store.homeInfo.avatar || defaultInfo.avatar,
-          nickName: store.homeInfo.nickname || defaultInfo.nickname,
+          avatarUrl: store.homeInfo.avatar,
+          nickName: store.homeInfo.nickname,
         },
       });
     },

miniprogram/pages/my/my.wxml

@@ -3,8 +3,8 @@
   <view class="mine_logo"></view>
   <view class="user_info">
     <block wx:if="{{canIUseNicknameComp}}">
-      <button wx:if="{{!userInfo.avatarUrl || userInfo.avatarUrl == defaultInfo.avatar}}" class="avatar_box" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
-        <image class="avatar" src="{{userInfo.avatarUrl}}"></image>
+      <button wx:if="{{!userInfo.avatarUrl}}" class="avatar_box" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
+        <image class="avatar" src="{{userInfo.avatarUrl || defaultInfo.avatar}}"></image>
       </button>
       <view wx:else class="avatar_box">
         <image class="avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
@@ -16,7 +16,7 @@
         <text class="nickname lineClamp1">{{userInfo.nickName}}</text>
       </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>
       <view wx:else>请使用2.10.4及以上版本基础库</view>
     </block> -->