From a84175b5e189ac6da0d80ac64f77a4b45e7c9157 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 14 十一月 2024 13:48:34 +0800
Subject: [PATCH] 1.添加瞬时流量相关2.优化界面3.修改原开阀和未关阀列表的sessionId为clientId
---
pages/openCard/openCard.wxml | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/pages/openCard/openCard.wxml b/pages/openCard/openCard.wxml
index ab44610..ac834e8 100644
--- a/pages/openCard/openCard.wxml
+++ b/pages/openCard/openCard.wxml
@@ -1,7 +1,7 @@
-<!--pages/openCard/openCard.wxml 寮�鍗℃椂鐨勮櫄鎷熷崱-->
+<!--pages/openCard/openCard.wxml 寮�闃�鏃剁殑铏氭嫙鍗�-->
<view class="container">
- <scroll-view class="list-container" scroll-y="true" scroll-x="false">
+ <scroll-view class="list-container" scroll-y="true" scroll-x="false" enable-flex="true" refresher-enabled="true" bindrefresherrefresh="onPullDownRefresh" refresher-triggered="{{isWXRefreshing}}">
<block wx:if="{{allCardPoints.length > 0}}" wx:for="{{allCardPoints}}" wx:key="index">
<view class="{{item.inUse===false?'item':'item-gray'}}">
<view class="item-card">
@@ -30,7 +30,7 @@
<image class="close" src="/images/close.svg" bindtap="handleClost"></image>
<view class="dialog-content" wx:if="{{dialog_mode}}">
<view class="dialog-title">璇烽�夋嫨鐏屾簤妯″紡</view>
- <button bindtap="handleAutoIrrigation">鑷鐏屾簤</button>
+ <button bindtap="postOpenValva">鑷鐏屾簤</button>
<button bindtap="handleSetDuration">瀹氱亴婧夋椂闀�</button>
<button bindtap="handleSetWaterVolume">瀹氱亴婧夋按閲�</button>
</view>
@@ -41,13 +41,13 @@
</view>
<view>
<view class="row">
- <view class="choseitem{{activeIndex === 0 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="0">
+ <view class="choseitem{{activeIndex === 0 ? 'active' : ''}}" bindtap="handleTimeWrapperTap" data-index="0">
<view class="chose-wrapper">
<text class="chose-number">{{irrigateProfile[0].defaultValue}}</text>
<text class="chose-label">{{irrigateProfile[0].unitText}}</text>
</view>
</view>
- <view class="choseitem{{activeIndex === 1 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="1">
+ <view class="choseitem{{activeIndex === 1 ? 'active' : ''}}" bindtap="handleTimeWrapperTap" data-index="1">
<view class="chose-wrapper">
<text class="chose-number">{{irrigateProfile[1].defaultValue}}</text>
<text class="chose-label">{{irrigateProfile[1].unitText}}</text>
@@ -55,13 +55,13 @@
</view>
</view>
<view class="row">
- <view class="choseitem{{activeIndex === 2 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="2">
+ <view class="choseitem{{activeIndex === 2 ? 'active' : ''}}" bindtap="handleTimeWrapperTap" data-index="2">
<view class="chose-wrapper">
<text class="chose-number">{{irrigateProfile[2].defaultValue}}</text>
<text class="chose-label">{{irrigateProfile[2].unitText}}</text>
</view>
</view>
- <view class="choseitem{{activeIndex === 3 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="3">
+ <view class="choseitem{{activeIndex === 3 ? 'active' : ''}}" bindtap="handleTimeWrapperTap" data-index="3">
<view class="chose-wrapper">
<text class="chose-number">{{irrigateProfile[3].defaultValue}}</text>
<text class="chose-label">{{irrigateProfile[3].unitText}}</text>
@@ -69,18 +69,18 @@
</view>
</view>
<view>
- <t-input label="" placeholder="鎴栧湪姝よ緭鍏ヨ嚜瀹氫箟鏃堕棿" bind:change="onTimeInputChange">
+ <t-input label="" value="{{costiomTime}}" placeholder="鎴栧湪姝よ緭鍏ヨ嚜瀹氫箟鏃堕棿" type="number" bind:change="onTimeInputChange">
</t-input>
- <t-radio-group wx:if="{{group_time}}" default-value="0" borderless t-class="box">
+ <t-radio-group bind:change="onGroupOpenTimeTypeChange" wx:if="{{group_time}}" default-value="0" borderless t-class="box">
<t-radio block="{{false}}" label="鍒嗛挓" value="0" />
<t-radio block="{{false}}" label="灏忔椂" value="1" />
</t-radio-group>
- <t-radio-group bind:change="onGroupChange" default-value="0" borderless t-class="box">
+ <t-radio-group bind:change="onGroupOpenTimeChange" value="{{radioValue}}" default-value="0" borderless t-class="box">
<t-radio block="{{false}}" label="鐜板湪寮�闃�" value="0" />
<t-radio block="{{false}}" label="璁″垝寮�闃�鏃堕棿" value="1" />
</t-radio-group>
- <text class="open-time" wx:if="{{isShowOpenTime}}">{{openTime}}</text>
- <button bindtap="handleSetWaterVolume">寮�闃�</button>
+ <text class="open-time" wx:if="{{isShowOpenTime}}">{{openTimeText}}</text>
+ <button bindtap="btnOpenOnTime">寮�闃�</button>
</view>
</view>
</view>
@@ -91,13 +91,13 @@
</view>
<view>
<view class="row">
- <view class="choseitem{{activeIndex === 0 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="0">
+ <view class="choseitem{{activeIndex === 0 ? 'active' : ''}}" bindtap="handleWaterWrapperTap" data-index="0">
<view class="chose-wrapper">
<text class="chose-number">{{irrigateProfile[0].defaultValue}}</text>
<text class="chose-label">{{irrigateProfile[0].unitText}}</text>
</view>
</view>
- <view class="choseitem{{activeIndex === 1 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="1">
+ <view class="choseitem{{activeIndex === 1 ? 'active' : ''}}" bindtap="handleWaterWrapperTap" data-index="1">
<view class="chose-wrapper">
<text class="chose-number">{{irrigateProfile[1].defaultValue}}</text>
<text class="chose-label">{{irrigateProfile[1].unitText}}</text>
@@ -105,13 +105,13 @@
</view>
</view>
<view class="row">
- <view class="choseitem{{activeIndex === 2 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="2">
+ <view class="choseitem{{activeIndex === 2 ? 'active' : ''}}" bindtap="handleWaterWrapperTap" data-index="2">
<view class="chose-wrapper">
<text class="chose-number">{{irrigateProfile[2].defaultValue}}</text>
<text class="chose-label">{{irrigateProfile[2].unitText}}</text>
</view>
</view>
- <view class="choseitem{{activeIndex === 3 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="3">
+ <view class="choseitem{{activeIndex === 3 ? 'active' : ''}}" bindtap="handleWaterWrapperTap" data-index="3">
<view class="chose-wrapper">
<text class="chose-number">{{irrigateProfile[3].defaultValue}}</text>
<text class="chose-label">{{irrigateProfile[3].unitText}}</text>
@@ -119,18 +119,20 @@
</view>
</view>
<view>
- <t-input label="" suffix="鍏�" align="right" type="number" placeholder="鎴栧湪姝よ緭鍏ヨ嚜瀹氫箟姘撮噺锛堢珛鏂圭背锛�" bind:change="onWaterInputChange">
+ <t-input label="" value="{{costiomWater}}" suffix="绔嬫柟绫�" align="right" type="number" placeholder="鎴栧湪姝よ緭鍏ヨ嚜瀹氫箟姘撮噺" bind:change="onWaterInputChange">
</t-input>
- <t-radio-group bind:change="onGroupChange" default-value="0" borderless t-class="box">
+ <t-radio-group bind:change="onGroupOpenTimeChange" value="{{radioValue}}" default-value="0" borderless t-class="box">
<t-radio block="{{false}}" label="鐜板湪寮�闃�" value="0" />
<t-radio block="{{false}}" label="璁″垝寮�闃�鏃堕棿" value="1" />
</t-radio-group>
- <text class="open-time" wx:if="{{isShowOpenTime}}">{{openTime}}</text>
- <button bindtap="handleSetWaterVolume">寮�闃�</button>
+ <text class="open-time" wx:if="{{isShowOpenTime}}">{{openTimeText}}</text>
+ <button bindtap="btnOpenOnWater">寮�闃�</button>
</view>
</view>
</view>
</view>
<!-- 骞存湀鏃ユ椂鍒� -->
- <t-date-time-picker title="閫夋嫨鏃ユ湡鍜屾椂闂�" visible="{{datetimeVisible}}" mode="minute" value="{{datetime}}" format="YYYY-MM-DD HH:mm" bindchange="onConfirm" bindpick="onColumnChange" bindcancel="hidePicker" start="{{datetime}}"/>
+ <t-date-time-picker title="閫夋嫨鏃ユ湡鍜屾椂闂�" visible="{{datetimeVisible}}" mode="minute" value="{{datetime}}" format="YYYY-MM-DD HH:mm" bindchange="onConfirm" bindpick="onColumnChange" bindcancel="hidePicker" start="{{dateStartTime}}" end="{{dateEndTime}}"/>
+ <!-- <t-dialog visible="{{showForceConfirm}}" content="褰撳墠铏氭嫙鍗¤鍗犵敤锛屾槸鍚﹀己鍒跺紑闃�锛�" confirm-btn="{{ { content: '寮哄埗寮�闃�', variant: 'base', theme: 'danger' } }}" cancel-btn="鍙栨秷" bind:confirm="confirmForceDialog" bind:cancel="cancelDialog" /> -->
+ <t-dialog class="error-dialog" title="寮�闃�閿欒" visible="{{showErrorDialog}}" content="{{errorData}}" confirm-btn="{{ confirmBtn }}" bind:confirm="closeErrorDialog" />
</view>
\ No newline at end of file
--
Gitblit v1.8.0