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
---
images/valve.svg | 1
pages/feedback/feedback.js | 15 ++
pages/home/home.js | 63 ++++++++----
app.wxss | 3
pages/valveList/valveList.wxss | 2
pages/valveList/valveList.wxml | 4
images/time.svg | 1
pages/feedback/feedback.wxml | 2
pages/rechargeCard/rechargeCard.wxml | 2
app.json | 13 +-
app.js | 2
api/config.js | 2
pages/openCard/openCard.js | 10 +-
pages/openCard/openCard.wxss | 12 +-
pages/openCard/openCard.wxml | 2
pages/rechargeMoney/rechargMoney.wxml | 2
pages/waterIntake/waterIntake.wxss | 13 ++
pages/waterIntake/waterIntake.js | 2
pages/waterIntake/waterIntake.wxml | 7
pages/home/home.wxml | 20 ++-
pages/home/home.wxss | 101 ++++++++++++++++----
21 files changed, 197 insertions(+), 82 deletions(-)
diff --git a/api/config.js b/api/config.js
index ccba7c8..03c1874 100644
--- a/api/config.js
+++ b/api/config.js
@@ -11,6 +11,8 @@
// BASEURL = 'http://127.0.0.1:8087/'
BASEURL = 'http://192.168.40.166:8087/'
// BASEURL = 'http://192.168.10.52:8087/'
+ // BASEURL = 'http://8.130.130.233:54321/prod-api/'
+ // BASEURL = 'https://sp.dayuyanjiuyuan.top/'
break
default:
BASEURL = ''
diff --git a/app.js b/app.js
index be46fc9..78a273b 100644
--- a/app.js
+++ b/app.js
@@ -16,7 +16,7 @@
globalData: {
sessionId:'',
clientId:'',
- tag:'ym',
+ tag:'sp',
userInfo: null,
userId:"",
userCode:"",
diff --git a/app.json b/app.json
index 7a67abd..b3ede3f 100644
--- a/app.json
+++ b/app.json
@@ -24,12 +24,11 @@
"componentFramework": "glass-easel",
"sitemapLocation": "sitemap.json",
"permission": {
- "scope": {
- "userLocation": {
- "desc": "涓轰簡鏇村ソ鐨勪负鎮ㄦ湇鍔★紝灏嗚幏鍙栨偍鐨勪綅缃俊鎭�"
- }
+ "scope.userLocation": {
+ "desc": "涓轰簡鏇村ソ鐨勪负鎮ㄦ湇鍔★紝灏嗚幏鍙栨偍鐨勪綅缃俊鎭�"
}
- }
-
-
+ },
+ "requiredPrivateInfos": [
+ "getLocation"
+ ]
}
\ No newline at end of file
diff --git a/app.wxss b/app.wxss
index 5b31953..192064f 100644
--- a/app.wxss
+++ b/app.wxss
@@ -38,6 +38,9 @@
z-index: 0;
margin-top: 10rpx;
margin-bottom: 20rpx;
+ overflow: hidden; /* 閬垮厤妯悜婊氬姩 */
+ width: 100%; /* 纭繚 scroll-view 鐨勫搴﹀崰婊＄埗瀹瑰櫒 */
+ flex-direction: column; /* 纭繚鍐呭鎸夊垪鎺掑垪 */
}
diff --git a/images/time.svg b/images/time.svg
new file mode 100644
index 0000000..0c174dc
--- /dev/null
+++ b/images/time.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="24" height="24" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="none" stroke="#1890FF" stroke-width="4" stroke-linejoin="round"/><path d="M24.0084 12.0001L24.0072 24.0089L32.4866 32.4883" stroke="#1890FF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/images/valve.svg b/images/valve.svg
new file mode 100644
index 0000000..37b8fd5
--- /dev/null
+++ b/images/valve.svg
@@ -0,0 +1 @@
+<svg height="1006" width="1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" viewBox="0 0 60 59"><desc>Created with Sketch.</desc><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage"><g sketch:type="MSLayerGroup" transform="translate(1.000000, 1.000000)" stroke="#1890FF" stroke-width="2" stroke-linecap="round"><path fill="#ffffffff" d="M49,35 L55,35 L55,57 L49,57 L49,35 Z" stroke-linejoin="round" sketch:type="MSShapeGroup"></path><path fill="#ffffffff" d="M9,54 L49,54 L49,38 L9,38" sketch:type="MSShapeGroup"></path><path fill="#ffffffff" d="M55,54 L58,54 L58,38 L55,38 L55,54 Z" sketch:type="MSShapeGroup"></path><path fill="#ffffffff" d="M3,35 L9,35 L9,57 L3,57 L3,35 Z" stroke-linejoin="round" sketch:type="MSShapeGroup"></path><path fill="#ffffffff" d="M0,54 L3,54 L3,38 L0,38 L0,54 Z" sketch:type="MSShapeGroup"></path><path fill="#ffffffff" d="M14,32 L44,32 L44,38 L14,38 L14,32 Z" stroke-linejoin="round" sketch:type="MSShapeGroup"></path><path fill="#ffffffff" d="M17,29 L41,29 L41,32 L17,32 L17,29 Z" stroke-linejoin="round" sketch:type="MSShapeGroup"></path><path fill="#ffffffff" d="M24,21 L34,21 L34,29 L24,29 L24,21 Z" stroke-linejoin="round" sketch:type="MSShapeGroup"></path><path fill="#ffffffff" d="M27,12 L31,12 L31,21 L27,21 L27,12 Z" stroke-linejoin="round" sketch:type="MSShapeGroup"></path><path fill="#ffffffff" d="M32.586,2.414 L32.414,2.586 C31.509,3.491 30.281,4 29,4 C27.719,4 26.491,3.491 25.586,2.586 L25.414,2.414 C24.509,1.509 23.281,1 22,1 L16.746,1 C14.125,1 12,3.125 12,5.746 L12,10.254 C12,12.875 14.125,15 16.746,15 L24,15 L24,12 L34,12 L34,15 L41.254,15 C43.875,15 46,12.875 46,10.254 L46,5.746 C46,3.125 43.875,1 41.254,1 L36,1 C34.719,1 33.491,1.509 32.586,2.414 L32.586,2.414 Z" stroke-linejoin="round" sketch:type="MSShapeGroup"></path><path fill="#ffffffff" d="M29,4 C29.699,4 30.376,3.836 31,3.551 L31,0 L27,0 L27,3.551 C27.624,3.836 28.301,4 29,4 L29,4 Z" stroke-linejoin="round" sketch:type="MSShapeGroup"></path></g></g></svg>
\ No newline at end of file
diff --git a/pages/feedback/feedback.js b/pages/feedback/feedback.js
index 2872086..273540c 100644
--- a/pages/feedback/feedback.js
+++ b/pages/feedback/feedback.js
@@ -27,7 +27,6 @@
height: 160,
},
originFiles: [],
-
contentValue: '', //鍙嶉璇︽儏
accSavePath: [], //涓婁紶鐨勯煶棰戞枃浠舵帴鍙ｈ繑鍥炵殑鍦板潃
photoSavePath: [], //涓婁紶鐨勭収鐗囨枃浠惰繑鍥炵殑鍦板潃
@@ -362,10 +361,15 @@
}, 1000)
},
+
//寮�鍚畾鏃跺櫒
startRecordingCountdown() {
console.log("startRecordingCountdown");
const that = this;
+ if (this.recordingInterval) {
+ // 濡傛灉瀹氭椂鍣ㄥ凡缁忓湪杩愯锛岄伩鍏嶉噸澶嶅惎鍔�
+ return;
+ }
this.recordingInterval = setInterval(() => {
const newVoiceTime = that.data.voiceTime + 1;
const newContDownTime = that.data.contDownTime - 1;
@@ -379,7 +383,12 @@
}
}, 1000);
},
-
+ onUnload() {
+ if (this.recordingInterval) {
+ clearInterval(this.recordingInterval);
+ this.recordingInterval = null;
+ }
+ },
stopRecordingCountdown() {
console.log("stopRecordingCountdown");
if (this.recordingInterval) {
@@ -503,7 +512,7 @@
this.setData({
isRefreshing: false,
pageCurr: 1,
- listData:[]
+ listData: []
});
}
const app = getApp();
diff --git a/pages/feedback/feedback.wxml b/pages/feedback/feedback.wxml
index 1973aeb..3b84cc8 100644
--- a/pages/feedback/feedback.wxml
+++ b/pages/feedback/feedback.wxml
@@ -46,7 +46,7 @@
<button class="fb-submit" bind:tap="submit">鎻愪氦</button>
</view>
- <scroll-view class="container-scroll" wx:if="{{currentTab === 1}}" scroll-y="true" refresher-enabled="true" refresher-threshold="50" bindrefresherrefresh="onPullDownRefresh" refresher-triggered="{{isRefreshing}}" bindscrolltolower="loadMore">
+ <scroll-view class="container-scroll" enable-flex="true" wx:if="{{currentTab === 1}}" scroll-y="true" refresher-enabled="true" refresher-threshold="50" bindrefresherrefresh="onPullDownRefresh" refresher-triggered="{{isRefreshing}}" bindscrolltolower="loadMore">
<block wx:for="{{listData}}" wx:key="index">
<t-swipe-cell style="width: 100%;" class="swipe-cell-base">
<view class="item">
diff --git a/pages/home/home.js b/pages/home/home.js
index 54d9a2c..cd54a3f 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -114,12 +114,12 @@
isLogin: true
})
if (app.globalData.sessionId) {
- this.getOpenList();
this.getUserDataBySession();
}
}).catch((err) => {});
storage.getItem('clientId').then((data) => {
app.globalData.clientId = data;
+ this.getOpenList();
}).catch((err) => {});
} else {
//鏈湴娌℃湁缂撳瓨寰俊鐧诲綍
@@ -128,7 +128,7 @@
if (this.data.options.param === "1") {
this.setData({
showTipDialog: true,
- tipData: "寮�闃�鍛戒护涓嬪彂鎴愬姛锛岀害20-60绉掑悗鍙埛鏂板揩閫熷叧闃�鍒楄〃鏌ョ湅鎵ц缁撴灉銆�"
+ tipData: "寮�闃�鍛戒护涓嬪彂鎴愬姛锛屽洜寮�闃�闇�瑕佹椂闂达紝绾�20-60绉掑悗鍙埛鏂板揩閫熷叧闃�鍒楄〃鏌ョ湅鎵ц缁撴灉銆�"
})
setTimeout(() => {
this.getOpenList();
@@ -143,19 +143,22 @@
}
},
wxLogin() {
- const that = this;
- wx.login({
- success: function (res) {
- if (res.code) {
- var code = res.code;
- console.log(code);
- // 灏哻ode鍙戦�佸埌鏈嶅姟鍣ㄨ幏鍙杘penid
- that.codeLogin(code);
- } else {
- console.log('鐧诲綍澶辫触锛�' + res.errMsg);
+ // if (!this.data.isLogin) {
+ const that = this;
+ wx.login({
+ success: function (res) {
+ if (res.code) {
+ var code = res.code;
+ console.log(code);
+ // 灏哻ode鍙戦�佸埌鏈嶅姟鍣ㄨ幏鍙杘penid
+ that.codeLogin(code);
+ } else {
+ console.log('鐧诲綍澶辫触锛�' + res.errMsg);
+ }
}
- }
- });
+ });
+ // }
+
},
//寰俊code鐧诲綍
codeLogin(codeData) {
@@ -278,7 +281,7 @@
showForceConfirm: false,
showConfirm: false,
showTipDialog: false,
- showUnBind:false
+ showUnBind: false
});
},
/**
@@ -349,7 +352,7 @@
const params = {
url: 'wx/valve/get',
data: {
- operator: app.globalData.sessionId
+ operator: app.globalData.clientId
}
};
get(params).then(data => {
@@ -564,9 +567,6 @@
title: '姝ｅ湪寮哄埗鍒犻櫎璇风◢鍊�...', // 鍔犺浇鎻愮ず鏂囧瓧
mask: true // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫忥紝榛樿涓� false
});
- that.setData({
- lastIntakeName: intakeName
- })
const data = {
vcNum: item.vcNum, //鍙栨按鍙D
rtuAddr: item.rtuAddr, //闃�鎺у櫒鍦板潃
@@ -598,9 +598,22 @@
} else {
displayText = "鍏抽榾"
}
+ let deleteText = "鍒犻櫎"
+ let time;
+ if (!item.dt) {
+ time = "鏆傛棤"
+ } else {
+ time = this.extractTime(item.dt)
+ }
+ if (item.waterInstant===null) {
+ item.waterInstant = "鏆傛棤"
+ }
+
return {
...item,
- displayText
+ displayText,
+ deleteText,
+ time
}; // 淇濈暀鎵�鏈夊叾浠栧瓧娈碉紝骞舵坊鍔� displayText 瀛楁
});
// 鏇存柊鍒楄〃鏁版嵁
@@ -674,5 +687,15 @@
this.setData({
showInfoDialog: false
})
+ },
+ //澶勭悊鏃堕棿鍘绘帀骞存湀鏃�
+ extractTime(datetimeString) {
+ const formattedDate = datetimeString.replace(" ", "T");
+ const date = new Date(formattedDate);
+ // 鑾峰彇灏忔椂銆佸垎閽熷拰绉�
+ const hours = date.getHours().toString().padStart(2, '0');
+ const minutes = date.getMinutes().toString().padStart(2, '0');
+ const seconds = date.getSeconds().toString().padStart(2, '0');
+ return `${hours}:${minutes}:${seconds}`;
}
})
\ No newline at end of file
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 110c3d0..89fc576 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -59,19 +59,25 @@
<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">
+ <t-swipe-cell style="width: 100%;">
<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 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>
-
+ <view class="item-right">
<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>
+ <view slot="right" class="delete-btn" bind:tap="onDelete" data-item="{{item}}">{{item.deleteText}}</view>
</t-swipe-cell>
</view>
</view>
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index eb58081..2fc672f 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -123,7 +123,8 @@
margin-bottom: 10rpx;
/* 鍥炬爣鍜屾枃鏈箣闂寸殑闂磋窛 */
}
-.center-view-question image{
+
+.center-view-question image {
padding-top: 10rpx;
width: 75rpx;
/* 鏍规嵁闇�瑕佽皟鏁村浘鏍囧ぇ灏� */
@@ -132,6 +133,7 @@
margin-bottom: 15rpx;
/* 鍥炬爣鍜屾枃鏈箣闂寸殑闂磋窛 */
}
+
.center-view text,
.center-view-question text {
margin-top: 15rpx;
@@ -161,7 +163,6 @@
background-color: #fff;
margin-bottom: 2rpx;
display: flex;
-
align-items: center;
padding-left: 30rpx;
padding-right: 30rpx;
@@ -199,10 +200,12 @@
}
.bottom-title-text {
-
- margin-right: 10rpx; /* 缁欐枃鏈拰鍥炬爣涔嬮棿娣诲姞涓�浜涢棿璺� */
- font-size: 16px; /* 瀛椾綋澶у皬 */
- color: #333; /* 瀛椾綋棰滆壊 */
+ margin-right: 10rpx;
+ /* 缁欐枃鏈拰鍥炬爣涔嬮棿娣诲姞涓�浜涢棿璺� */
+ font-size: 35rpx;
+ /* 瀛椾綋澶у皬 */
+ color: #333;
+ /* 瀛椾綋棰滆壊 */
}
.refresh-button {
@@ -278,11 +281,13 @@
.item-left {
display: flex;
align-items: center;
+ flex-direction: column;
+ /* 纭繚瀛愬厓绱犵旱鍚戞帓鍒� */
}
.item-left text {
font-size: 40rpx;
- min-width: 150rpx;
+
}
.item-img {
@@ -290,7 +295,7 @@
/* 鏍规嵁闇�瑕佽皟鏁村浘鏍囧ぇ灏� */
height: 40rpx;
/* 鏍规嵁闇�瑕佽皟鏁村浘鏍囧ぇ灏� */
- margin-left: 20rpx;
+
}
.dialog {
@@ -312,15 +317,22 @@
.item-button {
display: flex;
- height: 80rpx;
- padding: 0 60rpx;
+ height: 70rpx;
+ padding: 0 40rpx;
background-color: #1890FF;
color: white;
border: none;
border-radius: 20rpx;
- font-size: 30rpx;
+ font-size: 30rpx !important;
align-items: center;
justify-content: center;
+ white-space: nowrap; /* 纭繚鏂囧瓧涓嶆崲琛� */
+}
+
+.item-right {
+ display: flex;
+ /* 鍨傜洿鏂瑰悜灞呬腑 */
+ align-items: center;
}
.item-button:active {
@@ -365,7 +377,7 @@
.delete-btn {
display: flex;
- align-items: center;
+ align-items: center;
justify-content: center;
width: 120rpx;
height: 100%;
@@ -373,31 +385,37 @@
background-color: #e34d59;
}
-.swipe-cell{
+.swipe-cell {
display: flex;
- justify-content: space-between; /* 浣垮瓙鍏冪礌鍦ㄤ富杞翠笂鍧囧寑鍒嗗竷 */
+ justify-content: space-between;
+ /* 浣垮瓙鍏冪礌鍦ㄤ富杞翠笂鍧囧寑鍒嗗竷 */
background-color: #fff;
margin-bottom: 2rpx;
width: 100wh;
}
-.info-img{
+
+.info-img {
width: 50rpx;
height: 50rpx;
}
-.title-center{
+
+.title-center {
position: absolute;
/* 缁濆瀹氫綅 */
left: 50%;
/* 绉诲姩鍒板鍣ㄧ殑涓棿 */
transform: translateX(-50%);
display: flex;
- justify-content: space-between; /* 浣垮瓙鍏冪礌鍦ㄤ富杞翠笂鍧囧寑鍒嗗竷 */
- align-items: center; /* 鍨傜洿灞呬腑瀵归綈 */
+ justify-content: space-between;
+ /* 浣垮瓙鍏冪礌鍦ㄤ富杞翠笂鍧囧寑鍒嗗竷 */
+ align-items: center;
+ /* 鍨傜洿灞呬腑瀵归綈 */
}
-.content-container{
+.content-container {
white-space: pre-line;
- word-wrap: break-word; /* 闃叉闀垮崟璇嶆棤娉曟崲琛� */
+ word-wrap: break-word;
+ /* 闃叉闀垮崟璇嶆棤娉曟崲琛� */
}
.long-content {
@@ -405,4 +423,47 @@
margin-top: 16rpx;
font-size: 32rpx;
color: #888;
+}
+
+.flow-rate {
+ font-size: 30rpx !important;
+ margin-left: 10rpx;
+}
+
+.flow-time {
+ font-size: 30rpx !important;
+ align-items: center;
+ margin-left: 10rpx;
+ display: inline-flex;
+ min-width: 120rpx
+}
+
+.water-intake-name {
+ font-size: 50rpx !important;
+ margin-left: 15rpx;
+ margin-right: 15rpx;
+ white-space: nowrap; /* 闃叉鏂囨湰鎹㈣ */
+}
+
+.left-time {
+ width: 100%;
+ display: flex;
+ /* 鍨傜洿灞呬腑 */
+ align-items: center;
+ margin-top: 15rpx;
+
+}
+.left-intake-name{
+ width: 100%;
+ display: flex;
+ /* 鍨傜洿灞呬腑 */
+ align-items: center;
+}
+
+.item-img-left {
+ width: 40rpx;
+ /* 鏍规嵁闇�瑕佽皟鏁村浘鏍囧ぇ灏� */
+ height: 40rpx;
+ /* 鏍规嵁闇�瑕佽皟鏁村浘鏍囧ぇ灏� */
+
}
\ No newline at end of file
diff --git a/pages/openCard/openCard.js b/pages/openCard/openCard.js
index 1da3751..9305438 100644
--- a/pages/openCard/openCard.js
+++ b/pages/openCard/openCard.js
@@ -331,7 +331,7 @@
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
intakeName: this.data.intakeName, //鍙栨按鍙ｅ悕绉�
- operator: app.globalData.sessionId, //鎿嶄綔鍛�
+ operator: app.globalData.clientId, //鎿嶄綔鍛�
forceOpen: !!isforce // 浣跨敤閫昏緫闈炴搷浣滅 !! 鏉ョ‘淇� isForce 鏄竷灏斿��
};
post({
@@ -377,7 +377,7 @@
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
minutes: this.data.postMinutes, //鍒嗛挓
- operator: app.globalData.sessionId //鎿嶄綔鍛�
+ operator: app.globalData.clientId //鎿嶄綔鍛�
};
post({
url: "wx/valve/timed_close",
@@ -413,7 +413,7 @@
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
minutes: this.data.postMinutes, //鍒嗛挓
- operator: app.globalData.sessionId, //鎿嶄綔鍛�
+ operator: app.globalData.clientId, //鎿嶄綔鍛�
plannedOpenTime: this.data.openTime
};
post({
@@ -450,7 +450,7 @@
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
waterAmount: this.data.waterAmount, //姘撮噺
- operator: app.globalData.sessionId //鎿嶄綔鍛�
+ operator: app.globalData.clientId //鎿嶄綔鍛�
};
post({
url: "wx/valve/quantify_close",
@@ -486,7 +486,7 @@
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
waterAmount: this.data.waterAmount, //姘撮噺
- operator: app.globalData.sessionId, //鎿嶄綔鍛�
+ operator: app.globalData.clientId, //鎿嶄綔鍛�
plannedOpenTime: this.data.openTime
};
post({
diff --git a/pages/openCard/openCard.wxml b/pages/openCard/openCard.wxml
index b735497..ac834e8 100644
--- a/pages/openCard/openCard.wxml
+++ b/pages/openCard/openCard.wxml
@@ -1,7 +1,7 @@
<!--pages/openCard/openCard.wxml 寮�闃�鏃剁殑铏氭嫙鍗�-->
<view class="container">
- <scroll-view class="list-container" scroll-y="true" scroll-x="false" refresher-enabled="true" bindrefresherrefresh="onPullDownRefresh" refresher-triggered="{{isWXRefreshing}}">
+ <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">
diff --git a/pages/openCard/openCard.wxss b/pages/openCard/openCard.wxss
index 3c36ee5..ae61527 100644
--- a/pages/openCard/openCard.wxss
+++ b/pages/openCard/openCard.wxss
@@ -143,14 +143,14 @@
}
.dialog-title {
- font-size: 18px;
- margin-bottom: 20px;
+ font-size: 38rpx;
+ margin-bottom: 20rpx;
text-align: center;
}
.dialog-title-text {
- font-size: 18px;
- margin-bottom: 20px;
+ font-size: 38rpx;
+ margin-bottom: 20rpx;
text-align: center;
}
@@ -224,9 +224,7 @@
color: #1890FF;
}
-.choseitemactive text {
- color: #fff;
-}
+
.choseitem {
diff --git a/pages/rechargeCard/rechargeCard.wxml b/pages/rechargeCard/rechargeCard.wxml
index d095c82..55234ff 100644
--- a/pages/rechargeCard/rechargeCard.wxml
+++ b/pages/rechargeCard/rechargeCard.wxml
@@ -13,7 +13,7 @@
<!-- </view> -->
<!-- 铏氭嫙鍗� -->
- <scroll-view class="list-container" wx:if="{{currentTab === 0}}" scroll-y="true" refresher-enabled="true" bindrefresherrefresh="onPullDownRefresh" scroll-x="false" refresher-triggered="{{isWXRefreshing}}">
+ <scroll-view class="list-container" enable-flex="true" wx:if="{{currentTab === 0}}" scroll-y="true" refresher-enabled="true" bindrefresherrefresh="onPullDownRefresh" scroll-x="false" 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">
diff --git a/pages/rechargeMoney/rechargMoney.wxml b/pages/rechargeMoney/rechargMoney.wxml
index 904084a..41b4b3e 100644
--- a/pages/rechargeMoney/rechargMoney.wxml
+++ b/pages/rechargeMoney/rechargMoney.wxml
@@ -64,7 +64,7 @@
<view class="rechageList-view">
<text class="rechageList-view-head">鍏呭�艰褰�</text>
- <scroll-view class="list-container" scroll-y="true" scroll-x="false" refresher-enabled="true" refresher-threshold="50" bindrefresherrefresh="onPullDownRefresh" refresher-triggered="{{isWXRefreshing}}" bindscrolltolower="loadMore">
+ <scroll-view class="list-container" enable-flex="true" scroll-y="true" scroll-x="false" refresher-enabled="true" refresher-threshold="50" bindrefresherrefresh="onPullDownRefresh" refresher-triggered="{{isWXRefreshing}}" bindscrolltolower="loadMore">
<block wx:if="{{allRechargeList.length > 0}}" wx:for="{{allRechargeList}}" wx:key="index">
<view class="itemList">
<text class="item-card-text">{{item.rechargeTime}}</text>
diff --git a/pages/valveList/valveList.wxml b/pages/valveList/valveList.wxml
index 639a96b..d84bf77 100644
--- a/pages/valveList/valveList.wxml
+++ b/pages/valveList/valveList.wxml
@@ -11,7 +11,7 @@
<view class="indicator" wx:if="{{currentTab === 1}}"></view>
</view>
</view>
- <scroll-view class="list-container" wx:if="{{currentTab === 0}}" scroll-y="true" scroll-x="false" refresher-enabled="true" bindrefresherrefresh="onPullVirtualDownRefresh" scroll-x="false" refresher-triggered="{{isVirtualRefreshing}}" bindscrolltolower="loadVirtualMore">
+ <scroll-view class="list-container" enable-flex="true" wx:if="{{currentTab === 0}}" scroll-y="true" scroll-x="false" refresher-enabled="true" bindrefresherrefresh="onPullVirtualDownRefresh" refresher-triggered="{{isVirtualRefreshing}}" bindscrolltolower="loadVirtualMore">
<block wx:if="{{listVirtualData.length > 0}}" wx:for="{{listVirtualData}}" wx:key="index">
<view class="list-item" >
<!-- <image class="item-img" src="/images/pipeline.svg" /> -->
@@ -42,7 +42,7 @@
<view wx:if="{{ !virtualhasMore && listVirtualData.length > 0}}" class="loading">娌℃湁鏇村鏁版嵁</view>
</scroll-view>
- <scroll-view class="list-container" wx:else scroll-y="true" scroll-x="false" refresher-enabled="true" bindrefresherrefresh="onPullPhysicalDownRefresh" scroll-x="false" refresher-triggered="{{isPhysicalRefreshing}}" bindscrolltolower="loadPhysicalMore">
+ <scroll-view class="list-container" wx:else enable-flex="true" scroll-y="true" scroll-x="false" refresher-enabled="true" bindrefresherrefresh="onPullPhysicalDownRefresh" scroll-x="false" refresher-triggered="{{isPhysicalRefreshing}}" bindscrolltolower="loadPhysicalMore">
<block wx:if="{{listPhysicalData.length > 0}}" wx:for="{{listPhysicalData}}" wx:key="index">
<view class="list-item" >
<!-- <image class="item-img" src="/images/pipeline.svg" /> -->
diff --git a/pages/valveList/valveList.wxss b/pages/valveList/valveList.wxss
index 809cd29..11cb0e0 100644
--- a/pages/valveList/valveList.wxss
+++ b/pages/valveList/valveList.wxss
@@ -41,7 +41,7 @@
}
.tab {
- font-size: 16px;
+ font-size: 35rpx;
padding: 10px;
cursor: pointer;
position: relative;
diff --git a/pages/waterIntake/waterIntake.js b/pages/waterIntake/waterIntake.js
index 2d5be31..5bccf6d 100644
--- a/pages/waterIntake/waterIntake.js
+++ b/pages/waterIntake/waterIntake.js
@@ -225,7 +225,7 @@
get({
url: 'wx/intake/used_intakes',
data: {
- operatorId: getApp().globalData.sessionId
+ operatorId: getApp().globalData.clientId
}
})
.then((data) => {
diff --git a/pages/waterIntake/waterIntake.wxml b/pages/waterIntake/waterIntake.wxml
index 7e5e83f..575d44a 100644
--- a/pages/waterIntake/waterIntake.wxml
+++ b/pages/waterIntake/waterIntake.wxml
@@ -11,12 +11,13 @@
</view>
</block>
</view>
- <scroll-view class="list-container" scroll-y="true" refresher-enabled="true" refresher-threshold="50" bindrefresherrefresh="onPullDownRefresh_common" refresher-triggered="{{isRefreshing_common}}">
+ <scroll-view class="list-container" enable-flex="true" scroll-y="true" refresher-enabled="true" refresher-threshold="50" bindrefresherrefresh="onPullDownRefresh_common" refresher-triggered="{{isRefreshing_common}}">
<block wx:for="{{commonWaterPoints}}" wx:key="index">
<view class="item">
<view class="item-left">
- <text>{{item.intakeNum}}</text>
- <image class="item-img" src="{{item.isOnLine ? '/images/wifi_no.svg' : '/images/wifi_off.svg'}}" />
+ <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>
<text class="item-button" bindtap="choseCard" data-item="{{item}}">寮�闃�</text>
</view>
diff --git a/pages/waterIntake/waterIntake.wxss b/pages/waterIntake/waterIntake.wxss
index 8b40287..2be3a27 100644
--- a/pages/waterIntake/waterIntake.wxss
+++ b/pages/waterIntake/waterIntake.wxss
@@ -161,4 +161,15 @@
.result-item {
padding: 20rpx;
border-bottom: 1px solid #eaeaea;
-}
\ No newline at end of file
+}
+.item-img-left {
+ width: 40rpx;
+ /* 鏍规嵁闇�瑕佽皟鏁村浘鏍囧ぇ灏� */
+ height: 40rpx;
+ /* 鏍规嵁闇�瑕佽皟鏁村浘鏍囧ぇ灏� */
+
+}
+.water-intake-name {
+ font-size: 50rpx !important;
+ margin-left: 15rpx;
+}
--
Gitblit v1.8.0