From fe3ce21a469f7e2584dbcb85cb75022d149f436c Mon Sep 17 00:00:00 2001 From: zuoxiao <zuoxiao> Date: 星期二, 25 三月 2025 19:28:56 +0800 Subject: [PATCH] 更新灌溉计划页面,添加项目选择器和总灌溉时间计算功能;优化界面样式,增加SVG图标;修复项目列表和轮灌组显示逻辑;调整配置文件,添加libVersion字段。 --- pages/home/home.wxml | 112 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 84 insertions(+), 28 deletions(-) diff --git a/pages/home/home.wxml b/pages/home/home.wxml index 20de5ae..3b1e10a 100644 --- a/pages/home/home.wxml +++ b/pages/home/home.wxml @@ -1,52 +1,108 @@ <!--pages/home/home.wxml--> <view class="base-wrapper"> + <view class="head-wrapper"> <view class="head-top"> - <t-avatar class="avatar-example" image="{{image}}" size="120rpx" /> + <t-avatar class="avatar-example" image="{{image}}" size="120rpx" bind:tap="handleAvatarTap" /> <view class="head-text-wrapper"> - <text>{{userName}}</text> - <text>{{userCode}}</text> + <text bind:tap="wxLogin">{{userName}}</text> + <text class="head-bottom">{{userPhone}}</text> </view> + <view class="head-button-wrapper"> + <text class="unbind" bind:tap="unbind">瑙g粦</text> + <text class="head-bottom" bind:tap="feedBack">鑱旂郴瀹㈡湇</text> + </view> + <view class="scen-view" bind:tap="scenCode"> + <image class="scen-code" src="/images/scen_code.svg" /> + <text>鎵爜寮�闃�</text> + </view> + </view> - <text class="balance-label">{{userBalance}}</text> </view> <view class="center-wrapper"> - <view class="center-view"> - <t-avatar image="{{image}}" size="80rpx" /> - <text>鍙栨按鍙�</text> + <view class="center-view" bind:tap="recharge"> + <image src="/images/wallet.svg" /> + <text>鍏呭��</text> </view> - <view class="center-view" bind:tap="rechageTap"> - <t-avatar image="{{image}}" size="80rpx" /> - <text>鍏呭�肩即璐�</text> + <view class="center-view" bind:tap="openValve"> + <image src="/images/valva.svg" /> + <text>寮�闃�</text> </view> - <view class="center-view"> - <t-avatar image="{{image}}" size="80rpx" /> - <text>鐢ㄦ按璁板綍</text> + <view class="center-view" bind:tap="openValveList"> + <image src="/images/record.svg" /> + <text>寮�鍏抽榾璁板綍</text> </view> - <view class="center-view"> - <t-avatar image="{{image}}" size="80rpx" /> - <text>闂鍙嶉</text> + <view class="center-view" bind:tap="irrigation"> + <image src="/images/irrigation.svg" /> + <text>杞亴</text> </view> </view> <view class="bottom-title"> - <text>甯哥敤鐨勫彇姘村彛</text> + <text class="bottom-title-text">蹇�熷叧闃�</text> + <text class="refresh-button" bind:tap="startPullDownRefresh">鍒锋柊</text> </view> - <scroll-view class="scroll-view" scroll-y="true"> - <view class="scroll-bg"> - <view class="list-item" wx:for="{{listData}}" wx:for-item="item" wx:for-index="index"> - <text>{{item.name}}</text> - <view class="list-item-piping"> - <image src="/images/piping.png"></image> - <text>{{item.code}}</text> + <view class="divider"></view> + <!-- refresher-enabled="true" refresher-threshold="50" --> + <scroll-view class="scroll-view" scroll-x="false" scroll-y="true" refresher-enabled="{{isRefreshing==false?true:false}}" refresher-threshold="50" bindrefresherrefresh="onPullDownRefresh" refresher-triggered="{{isWXRefreshing}}"> + <view wx:if="{{isRefreshing}}" class="refresh-view"> + <view class="dot"></view> + <view class="dot"></view> + <view class="dot"></view> + </view> + <view class="scroll-bg"> + <view wx:if="{{listData.length > 0}}" class="list-item" wx:for="{{listData}}" wx:key="index"> + <view class="item-left"> + <!-- <image class="item-img" src="/images/pipeline.svg" /> --> + <text>{{item.intakeNum}}</text> + <image class="item-img" src="{{item.isOnLine ? '/images/wifi_no.svg' : '/images/wifi_off.svg'}}" /> + </view> + <view> + <!-- <t-switch class="switch" data-item="{{item}}" bindchange="handleChange" value="{{true}}" label="{{['寮�', '鍏�']}}" slot="note" /> --> + <text class="item-button" bind:tap="handleChange" data-item="{{item}}">鍏抽榾</text> + </view> </view> - <view> - <t-switch bindchange="handleChange" value="{{defaultVal}}" label="{{['寮�', '鍏�']}}" slot="note" /> + </view> + <view wx:if="{{listData.length === 0}}" class="noMore-View-home"> + <image class="noMore-img" src="/images/no_more.svg" /> + <text class="noMore-text">娌℃湁寮�娉佃褰�</text> + </view> + </scroll-view> + + <t-dialog class="dialog" visible="{{showConfirm}}" content="纭鍏抽棴{{waterIntakeName}}鍚楋紵" confirm-btn="{{ { content: '纭', variant: 'base', theme: 'danger' } }}" close-on-overlay-click="false" cancel-btn="鍙栨秷" bind:confirm="confirmDialog" bind:cancel="cancelDialog" /> + <t-dialog class="error-dialog" title="{{errorDialogTitle}}" visible="{{showErrorDialog}}" content="{{errorData}}" confirm-btn="{{ confirmBtn }}" bind:confirm="closeDialog" /> + <t-dialog visible="{{showForceConfirm}}" content="褰撳墠铏氭嫙鍗¤鍗犵敤锛屾槸鍚﹀己鍒跺紑闃�锛�" confirm-btn="{{ { content: '寮哄埗寮�闃�', variant: 'base', theme: 'danger' } }}" cancel-btn="鍙栨秷" bind:confirm="confirmForceDialog" bind:cancel="cancelDialog" /> + + <!-- 浣跨敤寰俊鍘熺敓寮圭獥缁勪欢 --> + <view class="project-modal" wx:if="{{showProjectDialog}}"> + <view class="project-modal-mask"></view> + <view class="project-modal-content"> + <view class="project-modal-header"> + <text class="project-modal-title">璇烽�夋嫨椤圭洰</text> + </view> + <view class="project-modal-body"> + + <radio-group class="project-radio-group" bindchange="onProjectChange"> + <label class="project-radio {{selectedProject === 'JYG' ? 'project-radio-selected' : ''}}"> + <radio value="JYG" checked="{{selectedProject === 'JYG'}}" color="#1890FF" /> + <text>鍢夊唱鍏抽」鐩�</text> + </label> + <label class="project-radio {{selectedProject === 'MQ' ? 'project-radio-selected' : ''}}"> + <radio value="MQ" checked="{{selectedProject === 'MQ'}}" color="#1890FF" /> + <text>姘戝嫟椤圭洰</text> + </label> + <label class="project-radio {{selectedProject === 'TEST' ? 'project-radio-selected' : ''}}"> + <radio value="TEST" checked="{{selectedProject === 'TEST'}}" color="#1890FF" /> + <text>娴嬭瘯椤圭洰</text> + </label> + </radio-group> + </view> + <view class="project-modal-footer"> + <button class="project-modal-btn" disabled="{{!selectedProject}}" bindtap="handleProjectConfirm">纭</button> </view> </view> </view> - </scroll-view> - + <t-dialog class="dialog" title="閫氱煡缁撴灉" visible="{{showTipDialog}}" content="{{tipData}}" confirm-btn="{{ confirmBtn }}" bind:confirm="cancelDialog" /> </view> \ No newline at end of file -- Gitblit v1.8.0