diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 9bc59ce..8bb62f3 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -315,6 +315,13 @@
},
// 点击检索
searchWellCode() {
+ if(!this.data.form.wellcode) {
+ wx.showToast({
+ icon: 'error',
+ title: '请先输入井编号',
+ })
+ return false
+ }
this.setData({
'listQuery.wellCode': this.data.form.wellcode
})
@@ -384,9 +391,9 @@
that.setData({
'form.wellcode': val.wellCode, // 井编号
'form.wellname': val.wellName, // 井名称
- 'form.welltype': that.data.form.welltype ? that.data.form.welltype : val.wellType, // 井名称
+ 'form.welltype': val.wellType, // 井类型
+ 'form.position': val.position, //位置描述
})
- console.log(this.data.form.wellCode);
that.cancleWellShow()
},
@@ -591,6 +598,19 @@
}
})
},
+ // 井编号输入框点击清除按钮
+// clickClearable() {
+// this.setData({
+// 'form.wellcode': ''
+// })
+// },
+ // 井编号改变
+ changeWellCode(e) {
+ console.log(e);
+ this.setData({
+ 'form.wellcode': e.detail
+ })
+ },
//input 输入框设置值
confirm(event) {
@@ -599,7 +619,7 @@
var formName = event.target.dataset.id;
var fromN = 'form.' + [formName];
that.setData({
- [fromN]: formValue
+ [fromN]: formValue,
})
//若输入是设备编号,自动获取设备类型
if('devcode'==formName){
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 9bc59ce..8bb62f3 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -315,6 +315,13 @@
},
// 点击检索
searchWellCode() {
+ if(!this.data.form.wellcode) {
+ wx.showToast({
+ icon: 'error',
+ title: '请先输入井编号',
+ })
+ return false
+ }
this.setData({
'listQuery.wellCode': this.data.form.wellcode
})
@@ -384,9 +391,9 @@
that.setData({
'form.wellcode': val.wellCode, // 井编号
'form.wellname': val.wellName, // 井名称
- 'form.welltype': that.data.form.welltype ? that.data.form.welltype : val.wellType, // 井名称
+ 'form.welltype': val.wellType, // 井类型
+ 'form.position': val.position, //位置描述
})
- console.log(this.data.form.wellCode);
that.cancleWellShow()
},
@@ -591,6 +598,19 @@
}
})
},
+ // 井编号输入框点击清除按钮
+// clickClearable() {
+// this.setData({
+// 'form.wellcode': ''
+// })
+// },
+ // 井编号改变
+ changeWellCode(e) {
+ console.log(e);
+ this.setData({
+ 'form.wellcode': e.detail
+ })
+ },
//input 输入框设置值
confirm(event) {
@@ -599,7 +619,7 @@
var formName = event.target.dataset.id;
var fromN = 'form.' + [formName];
that.setData({
- [fromN]: formValue
+ [fromN]: formValue,
})
//若输入是设备编号,自动获取设备类型
if('devcode'==formName){
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 3cdfa5d..7233a68 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -31,6 +31,11 @@
+
+
+
+
+
@@ -41,10 +46,6 @@
-
-
-
-
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 9bc59ce..8bb62f3 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -315,6 +315,13 @@
},
// 点击检索
searchWellCode() {
+ if(!this.data.form.wellcode) {
+ wx.showToast({
+ icon: 'error',
+ title: '请先输入井编号',
+ })
+ return false
+ }
this.setData({
'listQuery.wellCode': this.data.form.wellcode
})
@@ -384,9 +391,9 @@
that.setData({
'form.wellcode': val.wellCode, // 井编号
'form.wellname': val.wellName, // 井名称
- 'form.welltype': that.data.form.welltype ? that.data.form.welltype : val.wellType, // 井名称
+ 'form.welltype': val.wellType, // 井类型
+ 'form.position': val.position, //位置描述
})
- console.log(this.data.form.wellCode);
that.cancleWellShow()
},
@@ -591,6 +598,19 @@
}
})
},
+ // 井编号输入框点击清除按钮
+// clickClearable() {
+// this.setData({
+// 'form.wellcode': ''
+// })
+// },
+ // 井编号改变
+ changeWellCode(e) {
+ console.log(e);
+ this.setData({
+ 'form.wellcode': e.detail
+ })
+ },
//input 输入框设置值
confirm(event) {
@@ -599,7 +619,7 @@
var formName = event.target.dataset.id;
var fromN = 'form.' + [formName];
that.setData({
- [fromN]: formValue
+ [fromN]: formValue,
})
//若输入是设备编号,自动获取设备类型
if('devcode'==formName){
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 3cdfa5d..7233a68 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -31,6 +31,11 @@
+
+
+
+
+
@@ -41,10 +46,6 @@
-
-
-
-
diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js
index 23e3257..4d518bc 100644
--- a/miniprogram/pages/login/login.js
+++ b/miniprogram/pages/login/login.js
@@ -287,7 +287,14 @@
success: function (res) {
if(res.data.code === 200) { // 已绑定
app.globalData.projectList = res.data.data
- resolve()
+ if(!app.globalData.projectList.length) {
+ wx.showToast({
+ title: '此用户无项目,请联系管理员',
+ icon: 'none'
+ })
+ } else {
+ resolve()
+ }
}
},
fail: function (err) {
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 9bc59ce..8bb62f3 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -315,6 +315,13 @@
},
// 点击检索
searchWellCode() {
+ if(!this.data.form.wellcode) {
+ wx.showToast({
+ icon: 'error',
+ title: '请先输入井编号',
+ })
+ return false
+ }
this.setData({
'listQuery.wellCode': this.data.form.wellcode
})
@@ -384,9 +391,9 @@
that.setData({
'form.wellcode': val.wellCode, // 井编号
'form.wellname': val.wellName, // 井名称
- 'form.welltype': that.data.form.welltype ? that.data.form.welltype : val.wellType, // 井名称
+ 'form.welltype': val.wellType, // 井类型
+ 'form.position': val.position, //位置描述
})
- console.log(this.data.form.wellCode);
that.cancleWellShow()
},
@@ -591,6 +598,19 @@
}
})
},
+ // 井编号输入框点击清除按钮
+// clickClearable() {
+// this.setData({
+// 'form.wellcode': ''
+// })
+// },
+ // 井编号改变
+ changeWellCode(e) {
+ console.log(e);
+ this.setData({
+ 'form.wellcode': e.detail
+ })
+ },
//input 输入框设置值
confirm(event) {
@@ -599,7 +619,7 @@
var formName = event.target.dataset.id;
var fromN = 'form.' + [formName];
that.setData({
- [fromN]: formValue
+ [fromN]: formValue,
})
//若输入是设备编号,自动获取设备类型
if('devcode'==formName){
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 3cdfa5d..7233a68 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -31,6 +31,11 @@
+
+
+
+
+
@@ -41,10 +46,6 @@
-
-
-
-
diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js
index 23e3257..4d518bc 100644
--- a/miniprogram/pages/login/login.js
+++ b/miniprogram/pages/login/login.js
@@ -287,7 +287,14 @@
success: function (res) {
if(res.data.code === 200) { // 已绑定
app.globalData.projectList = res.data.data
- resolve()
+ if(!app.globalData.projectList.length) {
+ wx.showToast({
+ title: '此用户无项目,请联系管理员',
+ icon: 'none'
+ })
+ } else {
+ resolve()
+ }
}
},
fail: function (err) {
diff --git a/miniprogram/pages/validNameKeyword/validNameKeyword.js b/miniprogram/pages/validNameKeyword/validNameKeyword.js
index 757725b..3b7bbee 100644
--- a/miniprogram/pages/validNameKeyword/validNameKeyword.js
+++ b/miniprogram/pages/validNameKeyword/validNameKeyword.js
@@ -151,7 +151,15 @@
success: function (res) {
if(res.data.code === 200) { // 已绑定
app.globalData.projectList = res.data.data
- resolve()
+ if(!app.globalData.projectList.length) {
+ wx.showToast({
+ title: '此用户无项目,请联系管理员',
+ icon: 'none'
+ })
+ wx.navigateBack()
+ } else {
+ resolve()
+ }
}
},
fail: function (err) {
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 9bc59ce..8bb62f3 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -315,6 +315,13 @@
},
// 点击检索
searchWellCode() {
+ if(!this.data.form.wellcode) {
+ wx.showToast({
+ icon: 'error',
+ title: '请先输入井编号',
+ })
+ return false
+ }
this.setData({
'listQuery.wellCode': this.data.form.wellcode
})
@@ -384,9 +391,9 @@
that.setData({
'form.wellcode': val.wellCode, // 井编号
'form.wellname': val.wellName, // 井名称
- 'form.welltype': that.data.form.welltype ? that.data.form.welltype : val.wellType, // 井名称
+ 'form.welltype': val.wellType, // 井类型
+ 'form.position': val.position, //位置描述
})
- console.log(this.data.form.wellCode);
that.cancleWellShow()
},
@@ -591,6 +598,19 @@
}
})
},
+ // 井编号输入框点击清除按钮
+// clickClearable() {
+// this.setData({
+// 'form.wellcode': ''
+// })
+// },
+ // 井编号改变
+ changeWellCode(e) {
+ console.log(e);
+ this.setData({
+ 'form.wellcode': e.detail
+ })
+ },
//input 输入框设置值
confirm(event) {
@@ -599,7 +619,7 @@
var formName = event.target.dataset.id;
var fromN = 'form.' + [formName];
that.setData({
- [fromN]: formValue
+ [fromN]: formValue,
})
//若输入是设备编号,自动获取设备类型
if('devcode'==formName){
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 3cdfa5d..7233a68 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -31,6 +31,11 @@
+
+
+
+
+
@@ -41,10 +46,6 @@
-
-
-
-
diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js
index 23e3257..4d518bc 100644
--- a/miniprogram/pages/login/login.js
+++ b/miniprogram/pages/login/login.js
@@ -287,7 +287,14 @@
success: function (res) {
if(res.data.code === 200) { // 已绑定
app.globalData.projectList = res.data.data
- resolve()
+ if(!app.globalData.projectList.length) {
+ wx.showToast({
+ title: '此用户无项目,请联系管理员',
+ icon: 'none'
+ })
+ } else {
+ resolve()
+ }
}
},
fail: function (err) {
diff --git a/miniprogram/pages/validNameKeyword/validNameKeyword.js b/miniprogram/pages/validNameKeyword/validNameKeyword.js
index 757725b..3b7bbee 100644
--- a/miniprogram/pages/validNameKeyword/validNameKeyword.js
+++ b/miniprogram/pages/validNameKeyword/validNameKeyword.js
@@ -151,7 +151,15 @@
success: function (res) {
if(res.data.code === 200) { // 已绑定
app.globalData.projectList = res.data.data
- resolve()
+ if(!app.globalData.projectList.length) {
+ wx.showToast({
+ title: '此用户无项目,请联系管理员',
+ icon: 'none'
+ })
+ wx.navigateBack()
+ } else {
+ resolve()
+ }
}
},
fail: function (err) {
diff --git a/miniprogram/project.private.config.json b/miniprogram/project.private.config.json
index aefbde1..4593b53 100644
--- a/miniprogram/project.private.config.json
+++ b/miniprogram/project.private.config.json
@@ -49,13 +49,6 @@
"query": "",
"launchMode": "default",
"scene": null
- },
- {
- "name": "",
- "pathName": "pages/addDevice/addDevice",
- "query": "",
- "launchMode": "default",
- "scene": null
}
]
}