diff --git a/pages/workBench/components/reading/index.js b/pages/workBench/components/reading/index.js index 45709a1..d84a66a 100644 --- a/pages/workBench/components/reading/index.js +++ b/pages/workBench/components/reading/index.js @@ -80,7 +80,7 @@ Component({ alertSuccess("操作成功") this.init() setTimeout(() => { - that.jumpToReading() + that.jumpToReading({ currentTarget: { dataset: { id } } }) }, 500) }, async changeEndStatus(e) { diff --git a/pages/workBenchOld/index.js b/pages/workBenchOld/index.js new file mode 100644 index 0000000..a9919f7 --- /dev/null +++ b/pages/workBenchOld/index.js @@ -0,0 +1,66 @@ +// pages/workBench/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/workBenchOld/index.json b/pages/workBenchOld/index.json new file mode 100644 index 0000000..a6d770b --- /dev/null +++ b/pages/workBenchOld/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "navigator": "/components/navigator/index" + }, + "navigationStyle": "custom" +} \ No newline at end of file diff --git a/pages/workBenchOld/index.wxml b/pages/workBenchOld/index.wxml new file mode 100644 index 0000000..1614ad7 --- /dev/null +++ b/pages/workBenchOld/index.wxml @@ -0,0 +1,3 @@ + + + diff --git a/pages/workBenchOld/index.wxss b/pages/workBenchOld/index.wxss new file mode 100644 index 0000000..c989687 --- /dev/null +++ b/pages/workBenchOld/index.wxss @@ -0,0 +1 @@ +/* pages/workBench/index.wxss */ \ No newline at end of file diff --git a/pages/writeReading/components/readingInfo/index.js b/pages/writeReading/components/readingInfo/index.js index 6f00ff7..186bfd3 100644 --- a/pages/writeReading/components/readingInfo/index.js +++ b/pages/writeReading/components/readingInfo/index.js @@ -21,7 +21,6 @@ Component({ if (!newValue) { return; } - console.log("newValue", newValue) this.checkFinish(newValue) } }, @@ -66,7 +65,7 @@ Component({ return } alertSuccess("操作成功") - this.init() + wx.navigateBack() }, onPhotoFinish(e) { const { number, success } = e.detail; @@ -93,19 +92,20 @@ Component({ } alertSuccess("录入成功") const that = this; - setTimeout(() => { - const isFinished = that.checkFinish() + setTimeout(async () => { + const isFinished = await that.checkFinish() if (isFinished) { + wx.showModal({ title: '提示', - content: '所有电表都已抄完,是否结束抄表?', + content: '所有电表都已抄完,是否返回?', complete: async (res) => { if (res.cancel) { } if (res.confirm) { - await that.changeEndStatus() + // await that.changeEndStatus() wx.navigateBack() } }