From c768d20f2256ba40ebf6bc1be984c667d6bc7a11 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期五, 27 十二月 2024 14:52:59 +0800 Subject: [PATCH] 添加分享功能 --- pages/home/home.js | 77 ++++++++++++++++++++++++++++---------- 1 files changed, 57 insertions(+), 20 deletions(-) diff --git a/pages/home/home.js b/pages/home/home.js index 54d9a2c..b20556c 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: '姝e湪寮哄埗鍒犻櫎璇风◢鍊�...', // 鍔犺浇鎻愮ず鏂囧瓧 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,29 @@ 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}`; + }, + onShareAppMessage: function (options) { + // 璁剧疆鍒嗕韩鍐呭 + return { + title: '澶х鐏屾簤鍔╂墜', // 鍒嗕韩鏍囬 + path: '/pages/home/home', // 鍒嗕韩璺緞锛岃璺緞闇�瑕佹槸褰撳墠灏忕▼搴忓瓨鍦ㄧ殑椤甸潰璺緞 + imageUrl: '/images/logo2.jpg', // 鍒嗕韩鍥炬爣锛屽彲浠ユ槸缃戠粶鍥剧墖璺緞鎴栨湰鍦板浘鐗囪矾寰� + success: function (res) { + // 鍒嗕韩鎴愬姛鐨勫洖璋冨嚱鏁� + }, + fail: function (res) { + // 鍒嗕韩澶辫触鐨勫洖璋冨嚱鏁� + } + }; } }) \ No newline at end of file -- Gitblit v1.8.0