diff --git a/miniprogram/app.js b/miniprogram/app.js index 7291fc2..e0372c0 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -18,9 +18,9 @@ // this.globalData = {} }, globalData: { - // httpsUrl: "https://logapi.smartlog.work/", + httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地 + // httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地 // httpsUrl: "http://139.198.18.188:8083/", // url: "http://127.0.0.1:8083/", //httpsUrl: "http://127.0.0.1:8083/", diff --git a/miniprogram/app.js b/miniprogram/app.js index 7291fc2..e0372c0 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -18,9 +18,9 @@ // this.globalData = {} }, globalData: { - // httpsUrl: "https://logapi.smartlog.work/", + httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地 + // httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地 // httpsUrl: "http://139.198.18.188:8083/", // url: "http://127.0.0.1:8083/", //httpsUrl: "http://127.0.0.1:8083/", diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js index 8bb62f3..a8c7ee3 100644 --- a/miniprogram/pages/addDevice/addDevice.js +++ b/miniprogram/pages/addDevice/addDevice.js @@ -560,6 +560,10 @@ [photopathForm]: fileList[i].url.split("static/")[1] }) } + that.setData({ + 'form.project': app.globalData.selectProjectName, + 'projectName': app.globalData.selectProjectName, + }) //表单提交 wx.request({ method: "POST", diff --git a/miniprogram/app.js b/miniprogram/app.js index 7291fc2..e0372c0 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -18,9 +18,9 @@ // this.globalData = {} }, globalData: { - // httpsUrl: "https://logapi.smartlog.work/", + httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地 + // httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地 // httpsUrl: "http://139.198.18.188:8083/", // url: "http://127.0.0.1:8083/", //httpsUrl: "http://127.0.0.1:8083/", diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js index 8bb62f3..a8c7ee3 100644 --- a/miniprogram/pages/addDevice/addDevice.js +++ b/miniprogram/pages/addDevice/addDevice.js @@ -560,6 +560,10 @@ [photopathForm]: fileList[i].url.split("static/")[1] }) } + that.setData({ + 'form.project': app.globalData.selectProjectName, + 'projectName': app.globalData.selectProjectName, + }) //表单提交 wx.request({ method: "POST", diff --git a/miniprogram/pages/safeBook/safeBook.js b/miniprogram/pages/safeBook/safeBook.js index cf68ab1..0635536 100644 --- a/miniprogram/pages/safeBook/safeBook.js +++ b/miniprogram/pages/safeBook/safeBook.js @@ -122,6 +122,9 @@ success: function (res) { if(res.data.code === 200) { resolve(res.data.data) + console.log('123121241', res); + console.log('iiiiiiii', res.data); + console.log('rrrrrrrr', res.data.data); } }, fail: function (err) {