diff --git a/miniprogram/app.js b/miniprogram/app.js index 407da71..7291fc2 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,12 +20,12 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.109: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/", // httpsUrl: "http://111.198.10.15:21405", - httpsUrl: "https://gas.task.smartlog.work/", + // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, nickName:"", diff --git a/miniprogram/app.js b/miniprogram/app.js index 407da71..7291fc2 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,12 +20,12 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.109: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/", // httpsUrl: "http://111.198.10.15:21405", - httpsUrl: "https://gas.task.smartlog.work/", + // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, nickName:"", diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js index 45e067a..b741117 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.js +++ b/miniprogram/pages/addDevicelog/addDeviceLog.js @@ -21,6 +21,7 @@ deviceMode: "", installtimeFmt: '', show: false, + devcodeDisabled: false, // 控制设备编号不可编辑 form: { devcode: "", wellcode: "", @@ -255,6 +256,17 @@ }); }, + // 数据监听节点 + observers:{ + 'form.devcode': function(newValue, oldValue){ //监听 + if(newValue.length) { + this.setData({ // 通过监听器,自动计算sum的值 + devcodeDisabled: true + }) + } + } + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/app.js b/miniprogram/app.js index 407da71..7291fc2 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,12 +20,12 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.109: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/", // httpsUrl: "http://111.198.10.15:21405", - httpsUrl: "https://gas.task.smartlog.work/", + // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, nickName:"", diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js index 45e067a..b741117 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.js +++ b/miniprogram/pages/addDevicelog/addDeviceLog.js @@ -21,6 +21,7 @@ deviceMode: "", installtimeFmt: '', show: false, + devcodeDisabled: false, // 控制设备编号不可编辑 form: { devcode: "", wellcode: "", @@ -255,6 +256,17 @@ }); }, + // 数据监听节点 + observers:{ + 'form.devcode': function(newValue, oldValue){ //监听 + if(newValue.length) { + this.setData({ // 通过监听器,自动计算sum的值 + devcodeDisabled: true + }) + } + } + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml index 126f85c..7f8f676 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml +++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml @@ -6,7 +6,10 @@ - + + + + diff --git a/miniprogram/app.js b/miniprogram/app.js index 407da71..7291fc2 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,12 +20,12 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.109: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/", // httpsUrl: "http://111.198.10.15:21405", - httpsUrl: "https://gas.task.smartlog.work/", + // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, nickName:"", diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js index 45e067a..b741117 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.js +++ b/miniprogram/pages/addDevicelog/addDeviceLog.js @@ -21,6 +21,7 @@ deviceMode: "", installtimeFmt: '', show: false, + devcodeDisabled: false, // 控制设备编号不可编辑 form: { devcode: "", wellcode: "", @@ -255,6 +256,17 @@ }); }, + // 数据监听节点 + observers:{ + 'form.devcode': function(newValue, oldValue){ //监听 + if(newValue.length) { + this.setData({ // 通过监听器,自动计算sum的值 + devcodeDisabled: true + }) + } + } + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml index 126f85c..7f8f676 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml +++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml @@ -6,7 +6,10 @@ - + + + + diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index 1585d19..d62c475 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -171,6 +171,7 @@ //删除事件 delItem: function (e) { + console.log(app.globalData.role, ']]]]]]]'); if(app.globalData.role!='repair'){ wx.showToast({ icon: 'none', diff --git a/miniprogram/app.js b/miniprogram/app.js index 407da71..7291fc2 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,12 +20,12 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.109: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/", // httpsUrl: "http://111.198.10.15:21405", - httpsUrl: "https://gas.task.smartlog.work/", + // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, nickName:"", diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js index 45e067a..b741117 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.js +++ b/miniprogram/pages/addDevicelog/addDeviceLog.js @@ -21,6 +21,7 @@ deviceMode: "", installtimeFmt: '', show: false, + devcodeDisabled: false, // 控制设备编号不可编辑 form: { devcode: "", wellcode: "", @@ -255,6 +256,17 @@ }); }, + // 数据监听节点 + observers:{ + 'form.devcode': function(newValue, oldValue){ //监听 + if(newValue.length) { + this.setData({ // 通过监听器,自动计算sum的值 + devcodeDisabled: true + }) + } + } + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml index 126f85c..7f8f676 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml +++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml @@ -6,7 +6,10 @@ - + + + + diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index 1585d19..d62c475 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -171,6 +171,7 @@ //删除事件 delItem: function (e) { + console.log(app.globalData.role, ']]]]]]]'); if(app.globalData.role!='repair'){ wx.showToast({ icon: 'none', diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js index 4d518bc..d5346c4 100644 --- a/miniprogram/pages/login/login.js +++ b/miniprogram/pages/login/login.js @@ -280,13 +280,15 @@ var that = this await new Promise(resolve => { wx.request({ - url: app.globalData.httpsUrl + "/app/user/project", + url: app.globalData.httpsUrl + "app/user/project", data: { openId: app.globalData.openid }, success: function (res) { - if(res.data.code === 200) { // 已绑定 - app.globalData.projectList = res.data.data + if(res.data.code === 200) { + app.globalData.role = res.data.data.role === '1' ? 'repair' : 'member' + app.globalData.userName = res.data.data.phone + app.globalData.projectList = res.data.data.projects if(!app.globalData.projectList.length) { wx.showToast({ title: '此用户无项目,请联系管理员', diff --git a/miniprogram/app.js b/miniprogram/app.js index 407da71..7291fc2 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,12 +20,12 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.109: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/", // httpsUrl: "http://111.198.10.15:21405", - httpsUrl: "https://gas.task.smartlog.work/", + // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, nickName:"", diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js index 45e067a..b741117 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.js +++ b/miniprogram/pages/addDevicelog/addDeviceLog.js @@ -21,6 +21,7 @@ deviceMode: "", installtimeFmt: '', show: false, + devcodeDisabled: false, // 控制设备编号不可编辑 form: { devcode: "", wellcode: "", @@ -255,6 +256,17 @@ }); }, + // 数据监听节点 + observers:{ + 'form.devcode': function(newValue, oldValue){ //监听 + if(newValue.length) { + this.setData({ // 通过监听器,自动计算sum的值 + devcodeDisabled: true + }) + } + } + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml index 126f85c..7f8f676 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml +++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml @@ -6,7 +6,10 @@ - + + + + diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index 1585d19..d62c475 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -171,6 +171,7 @@ //删除事件 delItem: function (e) { + console.log(app.globalData.role, ']]]]]]]'); if(app.globalData.role!='repair'){ wx.showToast({ icon: 'none', diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js index 4d518bc..d5346c4 100644 --- a/miniprogram/pages/login/login.js +++ b/miniprogram/pages/login/login.js @@ -280,13 +280,15 @@ var that = this await new Promise(resolve => { wx.request({ - url: app.globalData.httpsUrl + "/app/user/project", + url: app.globalData.httpsUrl + "app/user/project", data: { openId: app.globalData.openid }, success: function (res) { - if(res.data.code === 200) { // 已绑定 - app.globalData.projectList = res.data.data + if(res.data.code === 200) { + app.globalData.role = res.data.data.role === '1' ? 'repair' : 'member' + app.globalData.userName = res.data.data.phone + app.globalData.projectList = res.data.data.projects if(!app.globalData.projectList.length) { wx.showToast({ title: '此用户无项目,请联系管理员', diff --git a/miniprogram/pages/validNameKeyword/validNameKeyword.js b/miniprogram/pages/validNameKeyword/validNameKeyword.js index 58dcb89..489146e 100644 --- a/miniprogram/pages/validNameKeyword/validNameKeyword.js +++ b/miniprogram/pages/validNameKeyword/validNameKeyword.js @@ -112,7 +112,7 @@ method: 'POST', success: function (res) { wx.hideLoading(); - if(res.data.code === 200) { // 已绑定 + if(res.data.code === 200) { // 登陆成功 that.fetchProjectList().then(() => { wx.switchTab({ url: '../indexapp/indexapp' @@ -144,13 +144,16 @@ var that = this await new Promise(resolve => { wx.request({ - url: app.globalData.httpsUrl + "/app/user/project", + url: app.globalData.httpsUrl + "app/user/project", data: { openId: app.globalData.openid }, success: function (res) { - if(res.data.code === 200) { // 已绑定 - app.globalData.projectList = res.data.data + if(res.data.code === 200) { + app.globalData.role = res.data.data.role + app.globalData.userName = res.data.data.phone + app.globalData.projectList = res.data.data.projects + if(!app.globalData.projectList.length) { wx.showToast({ title: '此用户无项目,请联系管理员', diff --git a/miniprogram/app.js b/miniprogram/app.js index 407da71..7291fc2 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,12 +20,12 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.109: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/", // httpsUrl: "http://111.198.10.15:21405", - httpsUrl: "https://gas.task.smartlog.work/", + // httpsUrl: "https://gas.task.smartlog.work/", // 线上 openid: null, indexCount:1, nickName:"", diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js index 45e067a..b741117 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.js +++ b/miniprogram/pages/addDevicelog/addDeviceLog.js @@ -21,6 +21,7 @@ deviceMode: "", installtimeFmt: '', show: false, + devcodeDisabled: false, // 控制设备编号不可编辑 form: { devcode: "", wellcode: "", @@ -255,6 +256,17 @@ }); }, + // 数据监听节点 + observers:{ + 'form.devcode': function(newValue, oldValue){ //监听 + if(newValue.length) { + this.setData({ // 通过监听器,自动计算sum的值 + devcodeDisabled: true + }) + } + } + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml index 126f85c..7f8f676 100644 --- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml +++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml @@ -6,7 +6,10 @@ - + + + + diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index 1585d19..d62c475 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -171,6 +171,7 @@ //删除事件 delItem: function (e) { + console.log(app.globalData.role, ']]]]]]]'); if(app.globalData.role!='repair'){ wx.showToast({ icon: 'none', diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js index 4d518bc..d5346c4 100644 --- a/miniprogram/pages/login/login.js +++ b/miniprogram/pages/login/login.js @@ -280,13 +280,15 @@ var that = this await new Promise(resolve => { wx.request({ - url: app.globalData.httpsUrl + "/app/user/project", + url: app.globalData.httpsUrl + "app/user/project", data: { openId: app.globalData.openid }, success: function (res) { - if(res.data.code === 200) { // 已绑定 - app.globalData.projectList = res.data.data + if(res.data.code === 200) { + app.globalData.role = res.data.data.role === '1' ? 'repair' : 'member' + app.globalData.userName = res.data.data.phone + app.globalData.projectList = res.data.data.projects if(!app.globalData.projectList.length) { wx.showToast({ title: '此用户无项目,请联系管理员', diff --git a/miniprogram/pages/validNameKeyword/validNameKeyword.js b/miniprogram/pages/validNameKeyword/validNameKeyword.js index 58dcb89..489146e 100644 --- a/miniprogram/pages/validNameKeyword/validNameKeyword.js +++ b/miniprogram/pages/validNameKeyword/validNameKeyword.js @@ -112,7 +112,7 @@ method: 'POST', success: function (res) { wx.hideLoading(); - if(res.data.code === 200) { // 已绑定 + if(res.data.code === 200) { // 登陆成功 that.fetchProjectList().then(() => { wx.switchTab({ url: '../indexapp/indexapp' @@ -144,13 +144,16 @@ var that = this await new Promise(resolve => { wx.request({ - url: app.globalData.httpsUrl + "/app/user/project", + url: app.globalData.httpsUrl + "app/user/project", data: { openId: app.globalData.openid }, success: function (res) { - if(res.data.code === 200) { // 已绑定 - app.globalData.projectList = res.data.data + if(res.data.code === 200) { + app.globalData.role = res.data.data.role + app.globalData.userName = res.data.data.phone + app.globalData.projectList = res.data.data.projects + if(!app.globalData.projectList.length) { wx.showToast({ title: '此用户无项目,请联系管理员', diff --git a/miniprogram/project.private.config.json b/miniprogram/project.private.config.json index 4593b53..0a98cb0 100644 --- a/miniprogram/project.private.config.json +++ b/miniprogram/project.private.config.json @@ -31,13 +31,6 @@ }, { "name": "", - "pathName": "pages/applog/applog", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "", "pathName": "pages/notice/notice", "query": "", "launchMode": "default",