根据接口修改

This commit is contained in:
2025-09-22 10:56:24 +08:00
parent ad4d9323ad
commit 76746682fa
16 changed files with 39 additions and 30 deletions

View File

@@ -6,6 +6,7 @@ Component({
*/
properties: {
meterInfo: Object,
routeId: String,
},
/**
@@ -20,9 +21,10 @@ Component({
*/
methods: {
jumpToHistory() {
const { meterInfo } = this.data;
const { meterInfo, routeId } = this.data;
console.log("meterInfo", meterInfo)
wx.navigateTo({
url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.parkId}`,
url: `/pages/readingHistory/index?meter=${meterInfo?.id}&park=${meterInfo?.parkId}&routeId=${routeId}`,
})
},
}

View File

@@ -6,7 +6,8 @@ Component({
*/
properties: {
active: Boolean,
meter: Object
meter: Object,
status: Number,
},
observers: {
"active": function (newValue) {

View File

@@ -1,4 +1,4 @@
<!--pages/writeReading/components/meterList/components/meterItem/index.wxml-->
<view class="wrapper {{isDeep ? 'deepBg' : ''}}" bind:tap="onClick">
<view class="wrapper {{isDeep ? 'deepBg' : ''}} {{status == 1 ? 'done' : ''}}" bind:tap="onClick">
{{meter.meterAddress}}
</view>

View File

@@ -19,6 +19,10 @@
}
.deepBg {
background-color: var(--deep-green);
background-color: var(--deep-green) !important;
color: white;
}
.done {
background-color: #ccc;
}

View File

@@ -32,9 +32,6 @@ Component({
})
}
},
"finishNumber": function(newValue) {
console.log("finishNumber0000000000-----------", newValue)
}
},
/**
* 组件的初始数据

View File

@@ -22,6 +22,7 @@
bind:click="handleSelect"
data-index="{{index}}"
data-id="{{item.meterId}}"
status="{{item.status}}"
/>
</view>
</scroll-view>

View File

@@ -51,7 +51,7 @@ Component({
return
}
setTimeout(() => {
that.triggerEvent("finish", { number: data?.integer, success: data?.integer != null && data?.integer !== "" })
that.triggerEvent("finish", { number: data?.integer + "." + data?.decimal || 0, success: data?.integer != null && data?.integer !== "" })
}, 100)
})

View File

@@ -22,7 +22,6 @@ Component({
if (!newValue) {
return;
}
console.log("---------------");
this.checkFinish(newValue)
}
},
@@ -86,9 +85,9 @@ Component({
}
},
async onSubmit() {
const { meterInfo, currentNumber } = this.data;
const { meterInfo, currentNumber, routeId } = this.data;
const { parkId, id } = meterInfo;
const { code, message } = await createReading(parkId, id, {
const { code, message } = await createReading(parkId, id, routeId, {
overall: `${currentNumber}`,
flat: `${currentNumber}`,
readAt: dayjs().format("YYYY-MM-DD HH:mm:ss"),
@@ -105,6 +104,7 @@ Component({
})
alertSuccess("录入成功")
const that = this;
that.triggerEvent("onSubmit")
setTimeout(async () => {
const isFinished = await that.checkFinish()
if (isFinished) {