Merge branch 'yongxu-dev' into devlop
# Conflicts: # soul-admin/src/api/ckb.ts # soul-admin/src/pages/content/PersonAddEditModal.tsx # soul-api/internal/model/person.go # 开发文档/1、需求/以界面定需求.md # 开发文档/1、需求/需求汇总.md
This commit is contained in:
@@ -35,10 +35,6 @@
|
||||
<view class="profile-name-row">
|
||||
<text class="user-name" bindtap="editNickname">{{userInfo.nickname || '点击设置昵称'}}</text>
|
||||
<view class="profile-name-actions">
|
||||
<view class="profile-edit-btn" bindtap="goToProfileShow">
|
||||
<image class="profile-edit-icon" src="/assets/icons/edit-gray.svg" mode="aspectFit"/>
|
||||
<text class="profile-edit-text">编辑</text>
|
||||
</view>
|
||||
<view class="become-member-btn {{isVip ? 'become-member-vip' : ''}}" wx:if="{{!auditMode}}" bindtap="goToVip">{{isVip ? '会员中心' : '成为会员'}}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
Reference in New Issue
Block a user