From ab8b53407a4d2213b1b3cdaf3cf649ef6c457dae Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 28 四月 2025 15:52:19 +0800
Subject: [PATCH] 优化首页项目选择逻辑，添加临时选择变量以支持未确认的项目选择；更新登录页面逻辑，确保从登录页返回时正确刷新数据并处理项目选择确认，提升用户体验。
---
pages/home/home.wxml | 88 ++++++++++++++++++++++++++++----------------
1 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 384154d..611bf0d 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -3,7 +3,13 @@
<view class="head-wrapper">
<view class="head-top">
- <t-avatar class="avatar-example" image="{{image}}" size="120rpx" bind:tap="handleAvatarTap" />
+ <view class="avatar-project-container">
+
+ <t-avatar class="avatar-example" image="{{image}}" size="120rpx" bind:tap="handleAvatarTap" />
+ <view class="current-project">
+ <text>{{ projectConfig[selectedProject].displayName }}</text>
+ </view>
+ </view>
<view class="head-text-wrapper">
<text bind:tap="wxLogin">{{userName}}</text>
<text class="head-bottom">{{userPhone}}</text>
@@ -41,10 +47,12 @@
<view class="bottom-title">
- <text class="bottom-title-text">蹇�熷叧闃�</text>
+ <view class="title-center">
+ <text class="bottom-title-text">蹇�熷叧闃�</text>
+ <image class="info-img" bind:tap="infoShow" src="/images/info.svg"></image>
+ </view>
<text class="refresh-button" bind:tap="startPullDownRefresh">鍒锋柊</text>
</view>
- <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">
@@ -53,16 +61,29 @@
<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 wx:if="{{listData.length > 0}}" wx:for="{{listData}}" wx:key="index">
+ <t-swipe-cell>
+ <view class="swipe-cell">
+ <view class="list-item">
+ <view class="item-left">
+ <view class="left-intake-name">
+ <image class="item-img-left" src="/images/valve.svg" />
+ <text class="water-intake-name">{{item.intakeNum}}</text>
+ <image class="item-img" src="{{item.isOnLine ? '/images/wifi_no.svg' : '/images/wifi_off.svg'}}" />
+ </view>
+ <view class="left-time">
+ <image class="item-img" src="/images/time.svg" />
+ <text class="flow-time">{{item.time}}</text>
+ <text class="flow-rate">鐬椂娴侀噺锛歿{item.waterInstant}} m鲁/h</text>
+ </view>
+ </view>
+ <view class="item-right">
+ <text class="item-button" bind:tap="handleChange" data-item="{{item}}">鍏抽榾</text>
+ </view>
+ </view>
+ </view>
+ <view slot="right" class="delete-btn" bind:tap="onDelete" data-item="{{item}}">{{item.deleteText}}</view>
+ </t-swipe-cell>
</view>
</view>
<view wx:if="{{listData.length === 0}}" class="noMore-View-home">
@@ -83,25 +104,14 @@
<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>
- <label class="project-radio {{selectedProject === 'SCHOOL' ? 'project-radio-selected' : ''}}">
- <radio value="SCHOOL" checked="{{selectedProject === 'SCHOOL'}}" color="#1890FF" />
- <text>瀛︽牎椤圭洰</text>
- </label>
- </radio-group>
+ <scroll-view scroll-y class="project-scroll-view">
+ <radio-group class="project-radio-group" bindchange="onProjectChange">
+ <label wx:for="{{projectList}}" wx:key="index" class="project-radio {{(tempSelectedProject || selectedProject) === item.key ? 'project-radio-selected' : ''}}">
+ <radio value="{{item.key}}" checked="{{(tempSelectedProject || selectedProject) === item.key}}" color="#1890FF" />
+ <text>{{item.displayName}}</text>
+ </label>
+ </radio-group>
+ </scroll-view>
</view>
<view class="project-modal-footer">
<button class="project-modal-btn" disabled="{{!selectedProject}}" bindtap="handleProjectConfirm">纭</button>
@@ -109,4 +119,18 @@
</view>
</view>
<t-dialog class="dialog" title="閫氱煡缁撴灉" visible="{{showTipDialog}}" content="{{tipData}}" confirm-btn="{{ confirmBtn }}" bind:confirm="cancelDialog" />
+ <t-dialog visible="{{showInfoDialog}}" title="鍙嬫儏鎻愮ず" confirm-btn="{{ confirmBtn }}" bind:confirm="confirmBtnInfoDialog">
+ <!-- 閫傞厤skyline锛屽鍔爐ype="list" -->
+ <scroll-view slot="content" type="list" scroll-y class="long-content">
+ <view class="content-container">
+ <text class="content-container">
+ 1.缃戠粶绛変笉鍙姉鍔涘洜绱犲彲鑳藉鑷磋澶囩姸鎬佹樉绀哄欢杩熸垨閿欒銆傦紙褰撹繘琛屼簡寮�闃�鎴栧叧闃�鎿嶄綔鍚庝細鏈変竴瀹氬欢鏃舵墠鍙‘璁ゆ槸鍚︽搷浣滄垚鍔燂級
+ 2.褰撴彁绀烘偍鎿嶄綔澶辫触鍚庢偍鍙◢鍚庡皾璇曢噸鏂版搷浣溿��
+ 3.鍦ㄥ畾鏃舵垨瀹氶噺寮�闃�鐨勯绾﹀紡寮�闃�鍚庯紝鍙湁闃�闂ㄥ埌杈剧害瀹氱殑鏃堕棿鎴愬姛寮�闃�鍚庢湭鍏抽榾璁板綍鎵嶄細鏄剧ず銆�
+ 4.鎴戜滑璇氭寶鍦伴個璇锋偍閫氳繃鎰忚鍙嶉娓犻亾鎻愬嚭瀹濊吹鐨勫缓璁垨鎰忚銆�
+ </text>
+
+ </view>
+ </scroll-view>
+ </t-dialog>
</view>
\ No newline at end of file
--
Gitblit v1.8.0