diff --git a/miniprogram/pageage/project_checking/list/index.js b/miniprogram/pageage/project_checking/list/index.js
index 9c46319..95f0d43 100644
--- a/miniprogram/pageage/project_checking/list/index.js
+++ b/miniprogram/pageage/project_checking/list/index.js
@@ -80,6 +80,13 @@ Page({
})
},
+ returnToPage: function () {
+ /*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../../../pages/gengduogongneng/gengduogongneng',
+ })
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/miniprogram/pageage/project_checking/list/index.json b/miniprogram/pageage/project_checking/list/index.json
index 460908e..9f00a0e 100644
--- a/miniprogram/pageage/project_checking/list/index.json
+++ b/miniprogram/pageage/project_checking/list/index.json
@@ -3,5 +3,6 @@
"van-overlay": "@vant/weapp/overlay/index" ,
"van-popup": "@vant/weapp/popup/index"
},
+ "navigationStyle":"custom",
"navigationBarTitleText": "举牌验收管理"
}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checking/list/index.wxml b/miniprogram/pageage/project_checking/list/index.wxml
index 60d5c2c..b564806 100644
--- a/miniprogram/pageage/project_checking/list/index.wxml
+++ b/miniprogram/pageage/project_checking/list/index.wxml
@@ -1,8 +1,17 @@
-
-
-
-
-
+
+
+
@@ -44,7 +53,7 @@
新增
-
+
diff --git a/miniprogram/pageage/project_problemmodify/quality/check/index.js b/miniprogram/pageage/project_problemmodify/quality/check/index.js
index 928f282..ee80874 100644
--- a/miniprogram/pageage/project_problemmodify/quality/check/index.js
+++ b/miniprogram/pageage/project_problemmodify/quality/check/index.js
@@ -59,10 +59,12 @@ Page({
if(res.code == 200){
let urls = [];
let minUrls = [];
- res.data.smarkUrl.split(',').forEach(element => {
- urls.push(that.data.request+element);
- minUrls.push(that.data.request+element+'.min.jpg');
- });
+ if(res.data.smarkUrl){
+ res.data.smarkUrl.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
that.setData({
infoData:res.data,
imageList:urls,
@@ -88,10 +90,12 @@ Page({
if(res.code == 200 && res.data){
let urls = [];
let minUrls = [];
- res.data.fileUrls.split(',').forEach(element => {
- urls.push(that.data.request+element);
- minUrls.push(that.data.request+element+'.min.jpg');
- });
+ if(res.data.fileUrls){
+ res.data.fileUrls.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
that.setData({
auditInfo:res.data,
auditImageList:urls,
@@ -163,33 +167,27 @@ Page({
//审核驳回
onRejectSave(){
let that = this;
- if(that.data.reject){
- if(that.data.rejectOpinion!=""){
- //弹出确认
- wx.showModal({
- title: '提示',
- content: '是否确认复检驳回?',
- success: function (sm) {
- if (sm.confirm) {
- // 用户点击了确定 可以调用了
- that.onSubmitSave(2);
- } else if (sm.cancel) {
- console.log('用户点击取消');
- }
- }
- })
- }else{
- app.toast("请填写整改驳回意见!")
- that.setData({
- loadShow:false
- })
- return;
- }
- }else{
- that.setData({
- reject:true
- });
- }
+ if(that.data.rejectOpinion!=""){
+ //弹出确认
+ wx.showModal({
+ title: '提示',
+ content: '是否确认复检驳回?',
+ success: function (sm) {
+ if (sm.confirm) {
+ // 用户点击了确定 可以调用了
+ that.onSubmitSave(2);
+ } else if (sm.cancel) {
+ console.log('用户点击取消');
+ }
+ }
+ })
+ }else{
+ app.toast("请填写整改驳回意见!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
},
//审核通过
onPassSave(){
@@ -202,8 +200,7 @@ Page({
if (sm.confirm) {
// 用户点击了确定 可以调用了
that.setData({
- reject:false,
- rejectOpinion:""
+ reject:false
});
that.onSubmitSave(4);
} else if (sm.cancel) {
diff --git a/miniprogram/pageage/project_problemmodify/quality/check/index.wxml b/miniprogram/pageage/project_problemmodify/quality/check/index.wxml
index 5df8172..6b459b9 100644
--- a/miniprogram/pageage/project_problemmodify/quality/check/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/quality/check/index.wxml
@@ -109,14 +109,14 @@
-
+
- 整改驳回意见
+ 整改复检意见
-
diff --git a/miniprogram/pageage/project_problemmodify/quality/info/index.js b/miniprogram/pageage/project_problemmodify/quality/info/index.js
index af99163..a7fd056 100644
--- a/miniprogram/pageage/project_problemmodify/quality/info/index.js
+++ b/miniprogram/pageage/project_problemmodify/quality/info/index.js
@@ -57,10 +57,12 @@ Page({
if(res.code == 200){
let urls = [];
let minUrls = [];
- res.data.smarkUrl.split(',').forEach(element => {
- urls.push(that.data.request+element);
- minUrls.push(that.data.request+element+'.min.jpg');
- });
+ if(res.data.smarkUrl){
+ res.data.smarkUrl.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
that.setData({
infoData:res.data,
imageList:urls,
@@ -92,10 +94,12 @@ Page({
if(res.code == 200 && res.data){
let urls = [];
let minUrls = [];
- res.data.fileUrls.split(',').forEach(element => {
- urls.push(that.data.request+element);
- minUrls.push(that.data.request+element+'.min.jpg');
- });
+ if(res.data.fileUrls){
+ res.data.fileUrls.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
that.setData({
auditInfo:res.data,
auditImageList:urls,
diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.js b/miniprogram/pageage/project_problemmodify/quality/list/index.js
index 8520c8d..43512c8 100644
--- a/miniprogram/pageage/project_problemmodify/quality/list/index.js
+++ b/miniprogram/pageage/project_problemmodify/quality/list/index.js
@@ -164,6 +164,13 @@ Page({
},
+ returnToPage: function () {
+ /*关闭当前页面,跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../../../../pages/gengduogongneng/gengduogongneng',
+ })
+ },
+
/**
* 生命周期函数--监听页面隐藏
*/
diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.json b/miniprogram/pageage/project_problemmodify/quality/list/index.json
index 5b62de2..3dcb14a 100644
--- a/miniprogram/pageage/project_problemmodify/quality/list/index.json
+++ b/miniprogram/pageage/project_problemmodify/quality/list/index.json
@@ -3,5 +3,6 @@
"van-overlay": "@vant/weapp/overlay/index" ,
"van-popup": "@vant/weapp/popup/index"
},
+ "navigationStyle":"custom",
"navigationBarTitleText": "质量隐患排查"
}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.wxml b/miniprogram/pageage/project_problemmodify/quality/list/index.wxml
index ec260f6..bf50fcc 100644
--- a/miniprogram/pageage/project_problemmodify/quality/list/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/quality/list/index.wxml
@@ -1,8 +1,17 @@
-
-
-
-
-
+
+
+
待我办理({{dzgCount}})
整改完成({{yclCount}})
@@ -45,14 +54,13 @@
-
新增
-
+
diff --git a/miniprogram/pageage/project_problemmodify/quality/modify/index.js b/miniprogram/pageage/project_problemmodify/quality/modify/index.js
index 6360620..25acffb 100644
--- a/miniprogram/pageage/project_problemmodify/quality/modify/index.js
+++ b/miniprogram/pageage/project_problemmodify/quality/modify/index.js
@@ -58,10 +58,12 @@ Page({
if(res.code == 200){
let urls = [];
let minUrls = [];
- res.data.smarkUrl.split(',').forEach(element => {
- urls.push(that.data.request+element);
- minUrls.push(that.data.request+element+'.min.jpg');
- });
+ if(res.data.smarkUrl){
+ res.data.smarkUrl.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
that.setData({
infoData:res.data,
imageList:urls,
@@ -86,9 +88,11 @@ Page({
res = res.data
if(res.code == 200 && res.data){
let urls = [];
- res.data.fileUrls.split(',').forEach(element => {
- urls.push(element+'.min.jpg');
- });
+ if(res.data.fileUrls){
+ res.data.fileUrls.split(',').forEach(element => {
+ urls.push(element+'.min.jpg');
+ });
+ }
that.setData({
auditInfo:res.data,
auditImgs:urls
diff --git a/miniprogram/pageage/project_problemmodify/security/check/index.js b/miniprogram/pageage/project_problemmodify/security/check/index.js
index 5030999..81c49e3 100644
--- a/miniprogram/pageage/project_problemmodify/security/check/index.js
+++ b/miniprogram/pageage/project_problemmodify/security/check/index.js
@@ -59,10 +59,12 @@ Page({
if(res.code == 200){
let urls = [];
let minUrls = [];
- res.data.smarkUrl.split(',').forEach(element => {
- urls.push(that.data.request+element);
- minUrls.push(that.data.request+element+'.min.jpg');
- });
+ if(res.data.smarkUrl){
+ res.data.smarkUrl.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
that.setData({
infoData:res.data,
imageList:urls,
@@ -88,10 +90,12 @@ Page({
if(res.code == 200 && res.data){
let urls = [];
let minUrls = [];
- res.data.fileUrls.split(',').forEach(element => {
- urls.push(that.data.request+element);
- minUrls.push(that.data.request+element+'.min.jpg');
- });
+ if(res.data.fileUrls){
+ res.data.fileUrls.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
that.setData({
auditInfo:res.data,
auditImageList:urls,
@@ -163,32 +167,26 @@ Page({
//审核驳回
onRejectSave(){
let that = this;
- if(that.data.reject){
- if(that.data.rejectOpinion!=""){
- //弹出确认
- wx.showModal({
- title: '提示',
- content: '是否确认复检驳回?',
- success: function (sm) {
- if (sm.confirm) {
- // 用户点击了确定 可以调用了
- that.onSubmitSave(2);
- } else if (sm.cancel) {
- console.log('用户点击取消');
- }
- }
- })
- }else{
- app.toast("请填写整改驳回意见!")
- that.setData({
- loadShow:false
- })
- return;
- }
+ if(that.data.rejectOpinion!=""){
+ //弹出确认
+ wx.showModal({
+ title: '提示',
+ content: '是否确认复检驳回?',
+ success: function (sm) {
+ if (sm.confirm) {
+ // 用户点击了确定 可以调用了
+ that.onSubmitSave(2);
+ } else if (sm.cancel) {
+ console.log('用户点击取消');
+ }
+ }
+ })
}else{
- that.setData({
- reject:true
- });
+ app.toast("请填写整改驳回意见!")
+ that.setData({
+ loadShow:false
+ })
+ return;
}
},
//审核通过
@@ -202,8 +200,7 @@ Page({
if (sm.confirm) {
// 用户点击了确定 可以调用了
that.setData({
- reject:false,
- rejectOpinion:""
+ reject:false
});
that.onSubmitSave(4);
} else if (sm.cancel) {
diff --git a/miniprogram/pageage/project_problemmodify/security/check/index.wxml b/miniprogram/pageage/project_problemmodify/security/check/index.wxml
index 018a4f3..3000507 100644
--- a/miniprogram/pageage/project_problemmodify/security/check/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/security/check/index.wxml
@@ -109,14 +109,14 @@
-
+
- 整改驳回意见
+ 整改复检意见
-
diff --git a/miniprogram/pageage/project_problemmodify/security/info/index.js b/miniprogram/pageage/project_problemmodify/security/info/index.js
index b063a36..a3d5a87 100644
--- a/miniprogram/pageage/project_problemmodify/security/info/index.js
+++ b/miniprogram/pageage/project_problemmodify/security/info/index.js
@@ -56,10 +56,12 @@ Page({
if(res.code == 200){
let urls = [];
let minUrls = [];
- res.data.smarkUrl.split(',').forEach(element => {
- urls.push(that.data.request+element);
- minUrls.push(that.data.request+element+'.min.jpg');
- });
+ if(res.data.smarkUrl){
+ res.data.smarkUrl.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
that.setData({
infoData:res.data,
imageList:urls,
@@ -90,10 +92,12 @@ Page({
if(res.code == 200 && res.data){
let urls = [];
let minUrls = [];
- res.data.fileUrls.split(',').forEach(element => {
- urls.push(that.data.request+element);
- minUrls.push(that.data.request+element+'.min.jpg');
- });
+ if(res.data.fileUrls){
+ res.data.fileUrls.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
that.setData({
auditInfo:res.data,
auditImageList:urls,
diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.js b/miniprogram/pageage/project_problemmodify/security/list/index.js
index ea1f0fe..6ab035c 100644
--- a/miniprogram/pageage/project_problemmodify/security/list/index.js
+++ b/miniprogram/pageage/project_problemmodify/security/list/index.js
@@ -150,6 +150,13 @@ Page({
this.getListData();
},
+ returnToPage: function () {
+ wx.redirectTo({
+ url: '../../../../pages/gengduogongneng/gengduogongneng',
+ })
+ },
+
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.json b/miniprogram/pageage/project_problemmodify/security/list/index.json
index 31fffc3..4d5a2fa 100644
--- a/miniprogram/pageage/project_problemmodify/security/list/index.json
+++ b/miniprogram/pageage/project_problemmodify/security/list/index.json
@@ -3,5 +3,6 @@
"van-overlay": "@vant/weapp/overlay/index" ,
"van-popup": "@vant/weapp/popup/index"
},
+ "navigationStyle":"custom",
"navigationBarTitleText": "安全隐患排查"
}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.wxml b/miniprogram/pageage/project_problemmodify/security/list/index.wxml
index 337c402..679fd50 100644
--- a/miniprogram/pageage/project_problemmodify/security/list/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/security/list/index.wxml
@@ -1,9 +1,17 @@
-
-
-
-
-
-
+
+
+
待我办理({{dzgCount}})
整改完成({{yclCount}})
@@ -45,7 +53,6 @@
-
@@ -53,6 +60,7 @@
+
diff --git a/miniprogram/pageage/project_problemmodify/security/modify/index.js b/miniprogram/pageage/project_problemmodify/security/modify/index.js
index a76e7a7..0f6ff61 100644
--- a/miniprogram/pageage/project_problemmodify/security/modify/index.js
+++ b/miniprogram/pageage/project_problemmodify/security/modify/index.js
@@ -58,10 +58,12 @@ Page({
if(res.code == 200){
let urls = [];
let minUrls = [];
- res.data.smarkUrl.split(',').forEach(element => {
- urls.push(that.data.request+element);
- minUrls.push(that.data.request+element+'.min.jpg');
- });
+ if(res.data.smarkUrl){
+ res.data.smarkUrl.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
that.setData({
infoData:res.data,
imageList:urls,
@@ -86,9 +88,11 @@ Page({
res = res.data
if(res.code == 200 && res.data){
let urls = [];
- res.data.fileUrls.split(',').forEach(element => {
- urls.push(element+'.min.jpg');
- });
+ if(res.data.fileUrls){
+ res.data.fileUrls.split(',').forEach(element => {
+ urls.push(element+'.min.jpg');
+ });
+ }
that.setData({
auditInfo:res.data,
auditImgs:urls
diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.js b/miniprogram/pages/gengduogongneng/gengduogongneng.js
index 193270a..e4cf112 100644
--- a/miniprogram/pages/gengduogongneng/gengduogongneng.js
+++ b/miniprogram/pages/gengduogongneng/gengduogongneng.js
@@ -80,7 +80,8 @@ Page({
},
method:"get",
success:function(res){
- if(res.statusCode =='200'){
+ res=res.data;
+ if(res.code =='200'){
that.setData({
menuList:res.data
})
@@ -206,7 +207,7 @@ Page({
//返回到工程列表页面
goGCLB:function(){
wx.redirectTo({
- url: '../gongchengliebiao/gongchengliebiao'
+ url: '../xiangmugaikuang/xiangmugaikuang'
})
},
diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml b/miniprogram/pages/gengduogongneng/gengduogongneng.wxml
index e79919d..fbd3708 100644
--- a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml
+++ b/miniprogram/pages/gengduogongneng/gengduogongneng.wxml
@@ -2,16 +2,15 @@