From eb64e401aa8f22f510914a21ec3cf89e1594f6cb Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 28 十月 2024 17:59:44 +0800
Subject: [PATCH] 1.修复开泵成功后跳转回首页时提示登录的bug
---
pages/home/home.wxml | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 5fab6fa..bc7edff 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -5,11 +5,11 @@
<view class="head-top">
<t-avatar class="avatar-example" image="{{image}}" size="120rpx" />
<view class="head-text-wrapper">
- <text>{{userName}}</text>
- <text class="head-bottom">{{userPhone}}</text>
+ <text bind:tap="wxLogin">{{userName}}</text>
+ <text wx:if="{{isLogin}}" class="head-bottom">{{userPhone}}</text>
</view>
<view class="head-button-wrapper">
- <text class="unbind" bind:tap="">瑙ｇ粦</text>
+ <text wx:if="{{isLogin}}" class="unbind" bind:tap="unbind">瑙ｇ粦</text>
<text class="head-bottom" bind:tap="feedBack">鑱旂郴瀹㈡湇</text>
</view>
<view class="scen-view" bind:tap="scenCode">
@@ -41,7 +41,11 @@
<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>
@@ -56,23 +60,23 @@
<view class="scroll-bg">
<view wx:if="{{listData.length > 0}}" class="list-item" wx:for="{{listData}}" wx:key="index">
<t-swipe-cell style="width: 100%;" class="swipe-cell-base">
- <view class="swipe-cell" >
- <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 slot="right" class="delete-btn" bind:tap="onDelete">鍒犻櫎</view>
- </t-swipe-cell>
+ <view class="swipe-cell">
+ <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 slot="right" class="delete-btn" bind:tap="onDelete" data-item="{{item}}">{{item.displayText}}</view>
+ </t-swipe-cell>
</view>
</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>
@@ -82,5 +86,15 @@
<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" />
-
+ <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">
+ 1.缃戠粶绛変笉鍙姉鍔涘洜绱犲彲鑳藉鑷磋澶囩姸鎬佹樉绀哄欢杩熸垨閿欒銆�
+ 2.褰撴彁绀烘偍鎿嶄綔澶辫触鍚庢偍鍙◢鍚庡皾璇曢噸鏂版搷浣溿��
+ 3.鍦ㄥ畾鏃舵垨瀹氶噺寮�闃�鐨勯绾﹀紡寮�闃�杩囩▼涓紝绯荤粺浠呮樉绀哄彇娑堢姸鎬併�傚綋鐢ㄦ埛鐐瑰嚮鍙栨秷鏃讹紝绋嬪簭浼氬皾璇曟墽琛屽彇娑堟搷浣滐紝浣嗗彲鑳藉洜缃戠粶绛変笉鍙姉鍔涘洜绱犺�屽け璐ャ��
+ 4.鎴戜滑璇氭寶鍦伴個璇锋偍閫氳繃鎰忚鍙嶉娓犻亾鎻愬嚭瀹濊吹鐨勫缓璁垨鎰忚銆�
+ </view>
+ </scroll-view>
+ </t-dialog>
</view>
\ No newline at end of file
--
Gitblit v1.8.0