diff --git a/pages/workBenchNew/components/workBenchReading/index.wxml b/pages/workBenchNew/components/workBenchReading/index.wxml index e87ae64..2d6a964 100644 --- a/pages/workBenchNew/components/workBenchReading/index.wxml +++ b/pages/workBenchNew/components/workBenchReading/index.wxml @@ -34,14 +34,14 @@ label="包含{{item.meterRoute}}个抄表点" data-id="{{item.id}}" data-type="look" - bind:click="jumpToReading" + catch:click="jumpToReading" > - 华昌宝能收费 + 物业代收1 + 物业代收2 + 物业代收线损 + 华昌宝能收费 @@ -50,23 +53,25 @@ - 状态 + 建筑 - + + {{ meterInfo.buildingName || "-" }} - 读数 + 楼层 - {{meterInfo.overall}} + {{ meterInfo.floor || "-" }} + diff --git a/pages/writeReading/components/meterInfo/index.wxss b/pages/writeReading/components/meterInfo/index.wxss index 6730339..acbe1a1 100644 --- a/pages/writeReading/components/meterInfo/index.wxss +++ b/pages/writeReading/components/meterInfo/index.wxss @@ -20,6 +20,15 @@ .info .title .address { font-size: 36rpx; font-weight: 800; + flex: 1; + margin-right: 24rpx; + word-break: break-all; +} + +.info .title .meterType { + display: flex; + justify-content: end; + width: 180rpx; } .info .detail { diff --git a/pages/writeReading/components/meterList/index.js b/pages/writeReading/components/meterList/index.js index f65e7e7..b9f8031 100644 --- a/pages/writeReading/components/meterList/index.js +++ b/pages/writeReading/components/meterList/index.js @@ -23,7 +23,7 @@ Component({ if (newActive === 0) { this.setData({ scrollLeft: 0 }) } else if (newActive > 0) { - this.setData({ scrollLeft: 220 * newList.length - 20 }) + this.setData({ scrollLeft: (220 * (newActive) - 20) + "rpx" }) } const { scrollWidth } = this.data; if (scrollWidth) { @@ -114,7 +114,8 @@ Component({ // }); // }, - scrollLeft() { + handleScrollLeft() { + console.log("left--------------") // 向左滚动:减少 scrollLeft,但不能小于0 const newScrollLeft = Math.max(0, this.data.scrollLeft - 200); this.setData({ @@ -122,7 +123,8 @@ Component({ }); }, - scrollRight() { + handleScrollRight() { + console.log("right-----------------") // 向右滚动:增加 scrollLeft,但不能超过 maxScrollLeft const newScrollLeft = Math.min(this.data.maxScrollLeft, this.data.scrollLeft + 200); this.setData({ diff --git a/pages/writeReading/components/meterList/index.wxml b/pages/writeReading/components/meterList/index.wxml index 50a2799..151514e 100644 --- a/pages/writeReading/components/meterList/index.wxml +++ b/pages/writeReading/components/meterList/index.wxml @@ -5,13 +5,13 @@ 电表列表 (总计{{list.length}}块,已抄{{list.length - finishNumber}}块) - + - + - diff --git a/pages/writeReading/components/readingInfo/index.js b/pages/writeReading/components/readingInfo/index.js index 1c7aa2d..f24df5e 100644 --- a/pages/writeReading/components/readingInfo/index.js +++ b/pages/writeReading/components/readingInfo/index.js @@ -26,7 +26,7 @@ Component({ this.checkFinish(newValue) }, "meterInfo": function(newValue) { - + console.log("workStatus------------", newValue) } }, /** diff --git a/pages/writeReading/index.wxml b/pages/writeReading/index.wxml index 1b26358..faa425a 100644 --- a/pages/writeReading/index.wxml +++ b/pages/writeReading/index.wxml @@ -11,8 +11,9 @@ + \ No newline at end of file