Merge remote-tracking branch 'origin/master'

jiangping

2024-07-16 0d3fc39d118fe82335b4a02624b17d60db53d2ef

 wechat_jiaxuan/pages/calculator/index.wxml

@@ -1,7 +1,8 @@
<!--pages/calculator/index.wxml-->
<view class="container" style="background-image: {{ 'url(' + background + ')' }};">
<view class="container">
  <image class="main_bg" src="{{ background }}" mode="widthFix"></image>
  <view class="container-content" style="overflow-y: {{ containerContentStyle }};">
    <van-nav-bar border="{{ false }}" custom-class="top-head-transparent" bind:click-left="navigateBack" fixed placeholder>
    <van-nav-bar  title="装修计算器" border="{{ false }}" custom-class="top-head-transparent" bind:click-left="navigateBack" fixed placeholder>
      <van-icon name="arrow-left" class="top-head-icon" slot="left" />
    </van-nav-bar>

@@ -70,14 +71,14 @@
        <view class="td rate">参考比例</view>
        <view class="td money">参考价格</view>
      </view>
      <view class="item" wx:for="{{ calculatorOptions }}" wx:key="index"
      <view class="item" wx:for="{{ activeList }}" wx:key="index"
        hidden="{{ type == item.info }}">
        <view class="flex th">
          <view class="td name">{{ item.name }}</view>
          <view class="td rate">占比{{ item.rate }}%</view>
          <view class="td money">合计{{ item.money }}(万元)</view>
        </view>
        <view class="flex tr" wx:for="{{ item.childList }}" wx:for-item="ite" wx:for-index="idx" wx:key="idx">
        <view class="flex tr" wx:for="{{ item.children }}" wx:for-item="ite" wx:for-index="idx" wx:key="idx">
          <view class="td name">{{ ite.name }}</view>
          <view class="td rate">{{ ite.rate }}%</view>
          <view class="td money">{{ ite.money }}</view>