From 8fbd6b8d09e70494d920cc0b77812e9643be3196 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 23 八月 2022 17:37:31 +0800
Subject: [PATCH] 2022.8.23
---
pages/module_ledger/ledgerhome/ledgerhome.js | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/pages/module_ledger/ledgerhome/ledgerhome.js b/pages/module_ledger/ledgerhome/ledgerhome.js
index d72761e..b4f9d86 100644
--- a/pages/module_ledger/ledgerhome/ledgerhome.js
+++ b/pages/module_ledger/ledgerhome/ledgerhome.js
@@ -85,8 +85,8 @@
this.getLedgerType(now.add(-1, 'M').format('YYYY-MM-DD'), r => {
this.setData({
lastMonthInfo: r[2]
- }, true)
- }) //涓婃湀
+ })
+ }, true) //涓婃湀
},
/**
@@ -181,6 +181,9 @@
monthInfo.overtime = moment().date() - this.DEADLINEDAY
monthInfo.percent = Math.round(monthInfo.finishedMust / monthInfo.totalMust * 100)
+ console.log(lastMonth);
+ console.log(monthInfo);
+
//閫夐」鍗�
var t = []
var p = []
@@ -207,7 +210,7 @@
var i = e.currentTarget.dataset.index.split(',')
var indexGroup = [parseInt(i[0]), parseInt(i[1])]
var ledger = this.data.pageList[indexGroup[0]][indexGroup[1]]
- console.log(indexGroup);
+ console.log(ledger);
var that = this
wx.navigateTo({
@@ -252,14 +255,14 @@
let that = this;
let query = wx.createSelectorQuery(); //蹇呴』瑕佸厛鍒涘缓涓�涓煡璇�
query.select(element).boundingClientRect(function (rect) {
- // let pageheight = that.data.pageheight.split('px')[0]
- // pageheight = parseInt(pageheight)
- // if (rect > pa) {
-
- // }
- that.setData({
- pageheight: rect.height + 'px'
- });
+ console.log(rect.height);
+ let pageheight = that.data.pageheight.split('px')[0]
+ pageheight = parseInt(pageheight)
+ if (rect.height > pageheight) {
+ that.setData({
+ pageheight: rect.height + 'px'
+ });
+ }
}).exec();
},
swichNav: function (e) {
@@ -271,7 +274,7 @@
currentTab: e.target.dataset.current,
navScrollLeft: e.target.dataset.current >= 3 ? ((e.target.dataset.current) * 60) : 0 //鍒ゆ柇褰撳墠閫変腑鐨勪釜鏁版槸鍚︽槸绗�5涓�
})
- that.tabsHeight('.page' + e.target.dataset.current); //鏌ヨ鍝竴涓厓绱�
+ // that.tabsHeight('.page' + e.target.dataset.current); //鏌ヨ鍝竴涓厓绱�
}
},
bindChange: function (e) {
@@ -280,7 +283,7 @@
currentTab: e.detail.current,
navScrollLeft: e.detail.current >= 3 ? ((e.detail.current) * 60) : 0 //鍒ゆ柇褰撳墠閫変腑鐨勪釜鏁版槸鍚︽槸绗�5涓�
});
- // that.tabsHeight('.page'+e.target.dataset.current); //鏌ヨ鍝竴涓厓绱�
+ that.tabsHeight('.page' + e.detail.current); //鏌ヨ鍝竴涓厓绱�
},
changeMonth(){
--
Gitblit v1.9.3