diff --git a/pages/bind/binduser.js b/pages/bind/binduser.js
index a0275c1..dae467c 100644
--- a/pages/bind/binduser.js
+++ b/pages/bind/binduser.js
@@ -142,6 +142,16 @@ Page({
*/
onShareAppMessage: function () {
+ },
+ showPw(){
+ wx.showModal({
+ title: '',
+ content: '默认密码是0000,如果您修改过或者账号错误,请联系贵公司管理员(一般是安全管理部门),请及时登陆pc端修改密码!',
+ showCancel:false,
+ confirmText:'知道了',
+ success (res) {
+ }
+ })
},
intro:function(){
let fileurl = getApp().globalData.serverUrl + 'media/安全生产管理系统-国检集团.docx'
diff --git a/pages/bind/binduser.wxml b/pages/bind/binduser.wxml
index 3bec4b6..fb1decb 100644
--- a/pages/bind/binduser.wxml
+++ b/pages/bind/binduser.wxml
@@ -29,6 +29,7 @@
+ 账号错误或忘记密码?
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7ead072..8ded766 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -94,5 +94,4 @@
-->
-
\ No newline at end of file
diff --git a/pages/inspect/add.js b/pages/inspect/add.js
index 4a74a80..fb39298 100644
--- a/pages/inspect/add.js
+++ b/pages/inspect/add.js
@@ -54,6 +54,7 @@ Page({
that.setData({
itemscheck:that.data.itemscheck
})
+ console.log(that.data.itemscheck)
},
bindcontentInput: function (e) {
this.data.content = e.detail.value
diff --git a/pages/inspect/detail.wxml b/pages/inspect/detail.wxml
index 9dc4850..82a551a 100644
--- a/pages/inspect/detail.wxml
+++ b/pages/inspect/detail.wxml
@@ -30,7 +30,7 @@
{{content}}
-检查表
+检查记录
diff --git a/pages/inspect/detail2.wxml b/pages/inspect/detail2.wxml
index 6510d2c..e4d5cbf 100644
--- a/pages/inspect/detail2.wxml
+++ b/pages/inspect/detail2.wxml
@@ -30,7 +30,7 @@
- 异常项目
+ 检查项目
{{checkitem__name}}
{{checkitem__content}}
@@ -40,9 +40,12 @@
异常描述
-
+
{{desc}}
+
+ 无
+
@@ -50,7 +53,7 @@
异常图片
-
+
@@ -76,7 +79,7 @@
处理图片
-
+
diff --git a/pages/inspect/handle.js b/pages/inspect/handle.js
index cd1823a..8f8f8b9 100644
--- a/pages/inspect/handle.js
+++ b/pages/inspect/handle.js
@@ -5,7 +5,8 @@ Page({
* 页面的初始数据
*/
data: {
- desc2:''
+ desc2:'',
+ img2:''
},
binddesc2Input: function (e) {
this.data.desc2 = e.detail.value
@@ -141,38 +142,39 @@ Page({
},
submit: function () {
var that = this
- if(that.data.desc2 == ''){
+ if(that.data.desc2 || that.data.img2){
+ let data = {
+ id:that.data.id,
+ desc2: that.data.desc2,
+ img2: that.data.img2
+ }
+ if (that.data.img2 && that.data.img2.indexOf(getApp().globalData.serverUrl) != -1) {
+ data.img2 = data.img2.replace(getApp().globalData.serverUrl, '')
+ }
+ wx.showLoading({
+ title: '提交中',
+ })
+ wx.request({
+ url: getApp().globalData.serverUrl + 'api/inspectitem?a=handle',
+ header: {
+ 'content-type': 'application/json', // 默认值
+ 'Cookie': getApp().globalData.sessionId,
+ },
+ method: 'POST',
+ data: data,
+ success: res => {
+ wx.navigateBack({
+
+ })
+ wx.hideLoading();
+ }
+ });
+ }else{
wx.showToast({
- title: '未填写处理描述',
+ title: '未填写处理描述或图片',
icon:'none'
})
- return
}
- let data = {
- id:that.data.id,
- desc2: that.data.desc2,
- img2: that.data.img2
- }
- if (that.data.img2 && that.data.img2.indexOf(getApp().globalData.serverUrl) != -1) {
- data.img2 = data.img2.replace(getApp().globalData.serverUrl, '')
- }
- wx.showLoading({
- title: '提交中',
- })
- wx.request({
- url: getApp().globalData.serverUrl + 'api/inspectitem?a=handle',
- header: {
- 'content-type': 'application/json', // 默认值
- 'Cookie': getApp().globalData.sessionId,
- },
- method: 'POST',
- data: data,
- success: res => {
- wx.navigateBack({
-
- })
- wx.hideLoading();
- }
- });
+
},
})
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 3c6eda7..d6c3f5e 100644
--- a/project.config.json
+++ b/project.config.json
@@ -7,6 +7,7 @@
"minified": true,
"newFeature": true,
"coverView": true,
+ "nodeModules": true,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
@@ -18,7 +19,9 @@
"disablePlugins": [],
"outputPath": ""
},
- "nodeModules": true
+ "useIsolateContext": true,
+ "useCompilerModule": false,
+ "userConfirmedUseCompilerModuleSwitch": false
},
"compileType": "miniprogram",
"libVersion": "2.9.4",