From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
wechat_jiaxuan/pages/calculator/index.wxml | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/wechat_jiaxuan/pages/calculator/index.wxml b/wechat_jiaxuan/pages/calculator/index.wxml
index 88ace3a..aefac9e 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>
@@ -20,7 +21,7 @@
<view class="value" wx:if="{{ type !== '' }}">{{ typeArray[type] }}</view>
<view class="placeholder" wx:else>璇烽�夋嫨</view>
</view>
- <van-icon class="icon" name="arrow-down" />
+ <van-icon color="#B08771" class="icon" name="arrow-down" />
</view>
</view>
@@ -31,14 +32,14 @@
<view class="value" wx:if="{{ info !== '' }}">{{ infoArray[info] }}</view>
<view class="placeholder" wx:else>璇烽�夋嫨</view>
</view>
- <van-icon class="icon" name="arrow-down" />
+ <van-icon color="#B08771" class="icon" name="arrow-down" />
</view>
</view>
<view class="form-item">
<view class="label">鎴垮眿闈㈢Н锛�</view>
<view class="input-box">
- <input class="input" placeholder-class="placeholder" placeholder="0"
+ <input class="input" type="number" placeholder-class="placeholder" placeholder="0"
data-index="area" bindinput="inputTyping" value="{{ area }}"/>
<view class="icon">銕�</view>
</view>
@@ -47,7 +48,7 @@
<view class="form-item">
<view class="label">瑁呬慨棰勭畻锛�</view>
<view class="input-box">
- <input class="input" placeholder-class="placeholder" placeholder="0"
+ <input class="input" type="number" placeholder-class="placeholder" placeholder="0"
data-index="money" bindinput="inputTyping" value="{{ money }}"/>
<view class="icon">涓囧厓</view>
</view>
@@ -55,7 +56,7 @@
<view class="form-item">
<view class="submit-btn" bindtap="submit" wx:if="{{ userPhone != null && userPhone != 'undefined' && userPhone.length === 11 }}">绔嬪嵆璁＄畻</view>
- <button class="submit-btn" wx:else
+ <button hover-class="none" class="submit-btn" wx:else
open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">绔嬪嵆璁＄畻</button>
</view>
</view>
@@ -63,21 +64,21 @@
<!-- 璁＄畻鍣� end -->
<!-- 璁＄畻缁撴灉灞曠ず -->
- <view class="results" style="opacity: {{ showResultMoney ? '1' : '0.2' }};">
+ <view class="results" style="position: {{ showResultMoney ? 'static' : 'absolute' }}">
<view class="results-title">鏈�浼樺瑁呭垎閰嶈〃</view>
<view class="flex thead">
<view class="td name">璇︽儏</view>
<view class="td rate">鍙傝�冩瘮渚�</view>
<view class="td money">鍙傝�冧环鏍�</view>
</view>
- <view class="item" wx:for="{{ calculatorOptions }}" wx:key="index"
+ <view style="opacity: {{ showResultMoney ? '1' : '0.2' }};" 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