Merge refs/remotes/origin/master into refs/heads/master

闫增涛

2024-03-22 88d80c9f40935c6ce7ea51683c6cdc1a80d1997b

 packagePersonal/pages/userSetting/index.wxml

@@ -2,13 +2,15 @@
  <view class="itemList">
    <view class="label">头像</view>
    <view class="contentImg">
      <t-avatar image="{{defaultAvatarUrl}}" class="user-center-card__header__avatar" />
      <t-avatar image="{{userInfo.icon}}" class="user-center-card__header__avatar" />
    </view>
    <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
    <view class="iconEdit" data-info="{{'icon'}}" bindtap="editIconInfo">
      <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
    </view>
  </view>
  <view class="itemList">
    <view class="label">用户名</view>
    <view class="content">{{userInfo.fullName || '微信用户'}}</view>
    <view class="content" data-info="{{'nickName'}}" bindtap="editUserInfo">{{userInfo.nickName || '微信用户'}}</view>
    <t-icon name="chevron-right" size="40rpx" color="#C2C2C2" />
  </view>
  <view class="itemList">
@@ -24,6 +26,14 @@
  <t-popup visible="{{userInfoBox}}" bind:visible-change="onVisibleChange" placement="bottom">
    <view class="block">
      <view class="body">
        <view class="from-item" wx:if="{{editType == 'nickName'}}">
          <view class="label"> 昵称： </view>
          <view class="item-content">
            <view class="inputBox1">
              <t-input placeholder="输入用户名" borderless value="{{userInfoForm.nickName}}" bindchange="onNameInput" />
            </view>
          </view>
        </view>
        <view class="from-item" wx:if="{{editType == 'phone'}}">
          <view class="label"> 手机号： </view>
          <view class="item-content">
@@ -40,7 +50,7 @@
            </view>
          </view>
        </view>
        <view class="from-item">
        <view class="from-item" wx:if="{{editType !== 'nickName'}}">
          <view class="label"> 图形验证码： </view>
          <view class="item-content">
            <view class="inputBox">