Merge remote-tracking branch 'origin/master'

jiangping

2024-07-22 b7fd27a4a7ac72eef5fc142cae9bb63fe69ef233

 wechat_jiaxuan/pages/userinfo/mysub.wxml

@@ -4,106 +4,55 @@
      <view class="name">需求</view>
      <view class="border"></view>
    </view> -->
    <view class="item {{ activeTabs == '0' ? 'active' : '' }}" data-val="1" bindtap="tabsChange">
    <view class="item {{ activeTabs == '1' ? 'active' : '' }}" data-val="1" bindtap="tabsChange">
      <view class="name">预约量尺</view>
      <view class="border"></view>
    </view>
    <view class="item {{ activeTabs == '1' ? 'active' : '' }}" data-val="2" bindtap="tabsChange">
    <view class="item {{ activeTabs == '2' ? 'active' : '' }}" data-val="2" bindtap="tabsChange">
      <view class="name">预算</view>
      <view class="border"></view>
    </view>
  </view>
  <view class="list">
    <view class="item">
    <view class="item" wx:for="{{ dataList }}">
      <view class="header">
        <view class="name">name</view>
        <view class="phone">198898</view>
        <view class="name">{{ item.name }}</view>
        <view class="phone">{{ item.phone }}</view>
      </view>
      <block wx:if="{{ false }}">
        <view class="line">
          <view class="label"><text class="spe">性</text>别</view>
          <view class="val">男</view>
        </view>
        <view class="line">
          <view class="label"><text class="spe">年</text>龄</view>
          <view class="val">男</view>
        </view>
      <block wx:if="{{ activeTabs == '1' }}">
        <view class="line">
          <view class="label">所在城市</view>
          <view class="val">男</view>
        </view>
        <view class="line">
          <view class="label">户型信息</view>
          <view class="val">男</view>
          <view class="val">
            <text>{{ item.provinceName }}{{ item.cityName }}{{ item.areaName || '' }}</text>
          </view>
        </view>
      </block>
      <!-- 预算 -->
      <block wx:if="{{ true }}">
      <block wx:else>
        <view class="line">
          <view class="label">房屋类型</view>
          <view class="val">男</view>
          <view class="val">{{ item.houseStatus == '0' ? '精装' : '毛坯' }}</view>
        </view>
        <view class="line">
          <view class="label">户型信息</view>
          <view class="val">男</view>
          <view wx:if="{{ item.houseType == '0' }}" class="val">一室一厅</view>
          <view wx:if="{{ item.houseType == '1' }}" class="val">二室一厅</view>
          <view wx:if="{{ item.houseType == '2' }}" class="val">两室两厅</view>
          <view wx:if="{{ item.houseType == '3' }}" class="val">三室一厅</view>
          <view wx:if="{{ item.houseType == '4' }}" class="val">四室一厅</view>
          <view wx:if="{{ item.houseType == '5' }}" class="val">五室两厅及以上</view>
        </view>
        <view class="line">
          <view class="label">房屋面积</view>
          <view class="val">男</view>
          <view class="val">{{ item.area }} m²</view>
        </view>
        <view class="line">
          <view class="label">装修预算</view>
          <view class="val">男</view>
          <view class="val">{{ item.budget }}万元</view>
        </view>
      </block>
      <view class="time">
        <view>提交时间：123213</view>
      </view>
    </view>
    <view class="item">
      <view class="header">
        <view class="name">name</view>
        <view class="phone">198898</view>
      </view>
      <block wx:if="{{ false }}">
        <view class="line">
          <view class="label"><text class="spe">性</text>别</view>
          <view class="val">男</view>
        </view>
        <view class="line">
          <view class="label"><text class="spe">年</text>龄</view>
          <view class="val">男</view>
        </view>
        <view class="line">
          <view class="label">所在城市</view>
          <view class="val">男</view>
        </view>
        <view class="line">
          <view class="label">户型信息</view>
          <view class="val">男</view>
        </view>
      </block>
      <!-- 预算 -->
      <block wx:if="{{ true }}">
        <view class="line">
          <view class="label">房屋类型</view>
          <view class="val">男</view>
        </view>
        <view class="line">
          <view class="label">户型信息</view>
          <view class="val">男</view>
        </view>
        <view class="line">
          <view class="label">房屋面积</view>
          <view class="val">男</view>
        </view>
        <view class="line">
          <view class="label">装修预算</view>
          <view class="val">男</view>
        </view>
      </block>
      <view class="time">
        <view>提交时间：123213</view>
        <view>提交时间：{{ item.crmDate }}</view>
      </view>
    </view>
  </view>