Merge remote-tracking branch 'origin/master'

jiangping

2024-07-16 39613118a5bae23c45498c4f5a939e83595f99f5

 wechat_jiaxuan/pages/mine/mine.wxml

@@ -1,14 +1,22 @@
<view class="container">
  <view class="navbar" style="padding-top: {{ clientTop }}px;height: {{clientHeight + clientTop}}px;">我的家</view>
  <image class="mine_bg" src="{{ MINE_BG }}" mode="widthFix"></image>
  <view class="userinfo">
    <image class="avatar" src=""></image>
    <image class="avatar" src="{{ imgurlFull ? imgurlFull : '../../static/images/default_avatar.png' }}"></image>
    <view class="content">
      <view class="header">
        <view class="name">苏灿</view>
        <view class="name">{{ member.nickname }}</view>
        <view data-index="3" bindtap="changePath" class="edit">编辑</view>
      </view>
      <view class="addr">合肥莲花小区</view>
      <view class="detail">120m² ｜3室1厅1厨1卫</view>
      <view class="addr">{{ member.district || '' }}</view>
      <view class="detail">
        <text wx:if="{{member.housearea}}">{{ member.housearea }}m²｜</text>
        <text class="item" wx:if="{{ houseType.val1 }}">{{ houseType.val1 }}室</text>
        <text class="item" wx:if="{{ houseType.val2 }}">{{ houseType.val2 }}厅</text>
        <text class="item" wx:if="{{ houseType.val3 }}">{{ houseType.val3 }}厨</text>
        <text class="item" wx:if="{{ houseType.val4 }}">{{ houseType.val4 }}卫</text>
        <text class="item" wx:if="{{ houseType.val5 }}">{{ houseType.val5 }}阳</text>
      </view>
    </view>
  </view>
  <view class="main_content">
@@ -27,14 +35,19 @@
      </view>
    </view>
    <view class="func_list">
      <view class="line">
      <view class="line" data-index="4" bindtap="changePath">
        <view class="name">员工绑定</view>
        <image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
      </view>
      <view class="line">
      <view class="line" data-index="5" bindtap="changePath">
        <view class="name">更多设置</view>
        <image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
      </view>
    </view>
  </view>
  <view class="liucheng">
    <view class="h1">服务流程</view>
    <view class="h2">专注厨房 更懂生活</view>
    <image class="img" src="{{ IMG_LIUCHENG }}" mode="widthFix"></image>
  </view>
</view>