diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js index a0dc6da..3b6e71b 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.js +++ b/miniprogram/pages/addDevicelog/addDeviceLog.js @@ -398,8 +398,7 @@ //获取与上次修改的信息 changeMsg: function () { var formNew = this.data.form; - console.log(this.data.detail) - var formOld = JSON.parse(this.data.detail); + var formOld = this.data.detail || JSON.parse(this.data.detail); var descpNew = ""; if (formNew.devcode != formOld.devcode) { descpNew += "修改设备编号,原值:" + formOld.devcode + ",新值:" + formNew.devcode + ";" @@ -461,7 +460,6 @@ //提交表单 formSubmit: function (event) { - //表单验证 if (!this.formValidate()) { return false; @@ -530,10 +528,13 @@ //扫码 scan() { - + var _this = this wx.scanCode({ success(res) { console.log(res) + _this.setData({ + ['form.devcode']: res.result + }) } }) }, diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js index a0dc6da..3b6e71b 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.js +++ b/miniprogram/pages/addDevicelog/addDeviceLog.js @@ -398,8 +398,7 @@ //获取与上次修改的信息 changeMsg: function () { var formNew = this.data.form; - console.log(this.data.detail) - var formOld = JSON.parse(this.data.detail); + var formOld = this.data.detail || JSON.parse(this.data.detail); var descpNew = ""; if (formNew.devcode != formOld.devcode) { descpNew += "修改设备编号,原值:" + formOld.devcode + ",新值:" + formNew.devcode + ";" @@ -461,7 +460,6 @@ //提交表单 formSubmit: function (event) { - //表单验证 if (!this.formValidate()) { return false; @@ -530,10 +528,13 @@ //扫码 scan() { - + var _this = this wx.scanCode({ success(res) { console.log(res) + _this.setData({ + ['form.devcode']: res.result + }) } }) }, diff --git a/miniprogram/project.private.config.json b/miniprogram/project.private.config.json index 8aeeeaa..dd4d942 100644 --- a/miniprogram/project.private.config.json +++ b/miniprogram/project.private.config.json @@ -1,7 +1,7 @@ { "projectname": "miniprogram", "setting": { - "compileHotReLoad": false, + "compileHotReLoad": true, "urlCheck": false }, "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",