From 0d3fc39d118fe82335b4a02624b17d60db53d2ef Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 17:38:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_jiaxuan/pages/calculator/index.wxml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/wechat_jiaxuan/pages/calculator/index.wxml b/wechat_jiaxuan/pages/calculator/index.wxml
index 88ace3a..3faaa93 100644
--- a/wechat_jiaxuan/pages/calculator/index.wxml
+++ b/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>
--
Gitblit v1.9.3