diff --git a/miniprogram/app.js b/miniprogram/app.js index f2c00b0..db1c90a 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -19,12 +19,7 @@ }, globalData: { // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址 - // httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地 - httpsUrl: "http://192.168.147.39:5905/",// 周甜本地 - // httpsUrl: "http://139.198.18.188:8083/", - // url: "http://127.0.0.1:8083/", - //httpsUrl: "http://127.0.0.1:8083/", - // httpsUrl: "http://111.198.10.15:21405", + httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名 // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, diff --git a/miniprogram/app.js b/miniprogram/app.js index f2c00b0..db1c90a 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -19,12 +19,7 @@ }, globalData: { // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址 - // httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地 - httpsUrl: "http://192.168.147.39:5905/",// 周甜本地 - // httpsUrl: "http://139.198.18.188:8083/", - // url: "http://127.0.0.1:8083/", - //httpsUrl: "http://127.0.0.1:8083/", - // httpsUrl: "http://111.198.10.15:21405", + httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名 // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js index 78bb997..86fd531 100644 --- a/miniprogram/pages/addDevice/addDevice.js +++ b/miniprogram/pages/addDevice/addDevice.js @@ -616,8 +616,8 @@ }) } that.setData({ - 'form.project': app.globalData.selectProjectName, - 'projectName': app.globalData.selectProjectName, + 'form.project': that.data.form.project, + 'projectName': that.data.form.project, }) //表单提交 wx.request({ diff --git a/miniprogram/app.js b/miniprogram/app.js index f2c00b0..db1c90a 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -19,12 +19,7 @@ }, globalData: { // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址 - // httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地 - httpsUrl: "http://192.168.147.39:5905/",// 周甜本地 - // httpsUrl: "http://139.198.18.188:8083/", - // url: "http://127.0.0.1:8083/", - //httpsUrl: "http://127.0.0.1:8083/", - // httpsUrl: "http://111.198.10.15:21405", + httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名 // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js index 78bb997..86fd531 100644 --- a/miniprogram/pages/addDevice/addDevice.js +++ b/miniprogram/pages/addDevice/addDevice.js @@ -616,8 +616,8 @@ }) } that.setData({ - 'form.project': app.globalData.selectProjectName, - 'projectName': app.globalData.selectProjectName, + 'form.project': that.data.form.project, + 'projectName': that.data.form.project, }) //表单提交 wx.request({ diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml index 9cafc03..871ea29 100644 --- a/miniprogram/pages/addDevice/addDevice.wxml +++ b/miniprogram/pages/addDevice/addDevice.wxml @@ -58,7 +58,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/miniprogram/app.js b/miniprogram/app.js index f2c00b0..db1c90a 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -19,12 +19,7 @@ }, globalData: { // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址 - // httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地 - httpsUrl: "http://192.168.147.39:5905/",// 周甜本地 - // httpsUrl: "http://139.198.18.188:8083/", - // url: "http://127.0.0.1:8083/", - //httpsUrl: "http://127.0.0.1:8083/", - // httpsUrl: "http://111.198.10.15:21405", + httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名 // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js index 78bb997..86fd531 100644 --- a/miniprogram/pages/addDevice/addDevice.js +++ b/miniprogram/pages/addDevice/addDevice.js @@ -616,8 +616,8 @@ }) } that.setData({ - 'form.project': app.globalData.selectProjectName, - 'projectName': app.globalData.selectProjectName, + 'form.project': that.data.form.project, + 'projectName': that.data.form.project, }) //表单提交 wx.request({ diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml index 9cafc03..871ea29 100644 --- a/miniprogram/pages/addDevice/addDevice.wxml +++ b/miniprogram/pages/addDevice/addDevice.wxml @@ -58,7 +58,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/miniprogram/pages/indexapp/indexapp.wxml b/miniprogram/pages/indexapp/indexapp.wxml index 83b1465..fd07fb5 100644 --- a/miniprogram/pages/indexapp/indexapp.wxml +++ b/miniprogram/pages/indexapp/indexapp.wxml @@ -52,10 +52,13 @@ - {{item.devcode}} {{item.devicetype}} - - {{item.installtime}} {{item.project}} - + + {{item.devcode}} {{item.devicetype}} + + {{item.installtime}} {{item.project}} + + + diff --git a/miniprogram/app.js b/miniprogram/app.js index f2c00b0..db1c90a 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -19,12 +19,7 @@ }, globalData: { // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址 - // httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地 - httpsUrl: "http://192.168.147.39:5905/",// 周甜本地 - // httpsUrl: "http://139.198.18.188:8083/", - // url: "http://127.0.0.1:8083/", - //httpsUrl: "http://127.0.0.1:8083/", - // httpsUrl: "http://111.198.10.15:21405", + httpsUrl: "https://grey.logapi.smartlog.work/", // 测试域名 // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js index 78bb997..86fd531 100644 --- a/miniprogram/pages/addDevice/addDevice.js +++ b/miniprogram/pages/addDevice/addDevice.js @@ -616,8 +616,8 @@ }) } that.setData({ - 'form.project': app.globalData.selectProjectName, - 'projectName': app.globalData.selectProjectName, + 'form.project': that.data.form.project, + 'projectName': that.data.form.project, }) //表单提交 wx.request({ diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml index 9cafc03..871ea29 100644 --- a/miniprogram/pages/addDevice/addDevice.wxml +++ b/miniprogram/pages/addDevice/addDevice.wxml @@ -58,7 +58,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/miniprogram/pages/indexapp/indexapp.wxml b/miniprogram/pages/indexapp/indexapp.wxml index 83b1465..fd07fb5 100644 --- a/miniprogram/pages/indexapp/indexapp.wxml +++ b/miniprogram/pages/indexapp/indexapp.wxml @@ -52,10 +52,13 @@ - {{item.devcode}} {{item.devicetype}} - - {{item.installtime}} {{item.project}} - + + {{item.devcode}} {{item.devicetype}} + + {{item.installtime}} {{item.project}} + + + diff --git a/miniprogram/pages/indexapp/indexapp.wxss b/miniprogram/pages/indexapp/indexapp.wxss index ef5028b..47a6019 100644 --- a/miniprogram/pages/indexapp/indexapp.wxss +++ b/miniprogram/pages/indexapp/indexapp.wxss @@ -28,7 +28,6 @@ .subtitle { font-size: 28rpx; color: #665D5D; - height: 1rpx; } .point-image { @@ -50,6 +49,7 @@ margin-top: 2px; border-bottom: 1px solid #e5e5e5; /* flex-flow: column; */ + line-height: 28rpx; } .log-info {