提交代码

miniprogram/pageage/project_checking/list/index.js

@@ -80,6 +80,13 @@ Page({
     })
     },
 
+    returnToPage: function () {
+      /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+      wx.redirectTo({
+        url: '../../../pages/gengduogongneng/gengduogongneng',
+      })
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

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": "举牌验收管理"
 }

miniprogram/pageage/project_checking/list/index.wxml

@@ -1,8 +1,17 @@
-    <van-sticky  offset-top="{{ 0 }}">
+<view class="header_title">
-       <view  style="background: #191d28;">
+  <view class="header_title_row">
-       <project-select init="{{initData}}"></project-select>
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
+      </van-col>
+      <van-col span="15">
+        <view class="header_name">举牌验收管理</view>
+      </van-col>
+    </van-row>
   </view>
-</van-sticky>
+</view>
+<view class="max_content">
+<project-select init="{{initData}}"></project-select>
 <view class="inspect_max">
    <view class="inspect_list">
        <view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
@@ -44,7 +53,7 @@
    <image src="../../../images/new_add.png"></image>
    <view>新增</view>
 </view>
-</view>
+</view></view>
 
 
 

miniprogram/pageage/project_problemmodify/quality/check/index.js

@@ -59,10 +59,12 @@ Page({
             if(res.code == 200){
               let urls = [];
               let minUrls = [];
+              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 = [];
+              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,7 +167,6 @@ Page({
   //审核驳回
   onRejectSave(){
     let that = this;
-    if(that.data.reject){
     if(that.data.rejectOpinion!=""){
       //弹出确认
       wx.showModal({
@@ -185,11 +188,6 @@ Page({
       })
       return;
   }
-    }else{
-        that.setData({
-            reject:true
-        });
-    }
   },
   //审核通过
   onPassSave(){
@@ -202,8 +200,7 @@ Page({
           if (sm.confirm) {
               // 用户点击了确定 可以调用了
               that.setData({
-                reject:false,
+                reject:false
-                rejectOpinion:""
               });
               that.onSubmitSave(4);
             } else if (sm.cancel) {

miniprogram/pageage/project_problemmodify/quality/check/index.wxml

@@ -109,14 +109,14 @@
                 </view>
           </view>
     </view>
-    <view class="inspect_overview" wx:if="{{reject}}">
+    <view class="inspect_overview" wx:if="true">
             <view class="module_title module_title_padding">
-                <view>整改驳回意见</view>
+                <view>整改复检意见</view>
             </view>
             <view class="inspect_overview_list_max">
               <view class="inspect_info_list" >
                   <view class="inspect_info_content">
-                  <textarea  class="add_textarea" placeholder="请填写整改说明"
+                  <textarea  class="add_textarea" placeholder="请填写整改复检意见"
                   placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
                 </view>
               </view>

miniprogram/pageage/project_problemmodify/quality/info/index.js

@@ -57,10 +57,12 @@ Page({
             if(res.code == 200){
               let urls = [];
               let minUrls = [];
+              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 = [];
+            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,

miniprogram/pageage/project_problemmodify/quality/list/index.js

@@ -164,6 +164,13 @@ Page({
 
     },
 
+    returnToPage: function () {
+      /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+      wx.redirectTo({
+        url: '../../../../pages/gengduogongneng/gengduogongneng',
+      })
+    },
+
     /**
      * 生命周期函数--监听页面隐藏
      */

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": "质量隐患排查"
 }

miniprogram/pageage/project_problemmodify/quality/list/index.wxml

@@ -1,8 +1,17 @@
-    <van-sticky  offset-top="{{ 0 }}">
+<view class="header_title">
-       <view  style="background: #191d28;">
+  <view class="header_title_row">
-       <project-select init="{{initData}}"></project-select>
+    <van-row>
+      <van-col span="3">
+        <view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
+      </van-col>
+      <van-col span="15">
+        <view class="header_name">质量隐患排查</view>
+      </van-col>
+    </van-row>
   </view>
-</van-sticky>
+</view>
+<view class="max_content">    
+<project-select init="{{initData}}"></project-select>
 <view class="modify_video_nav" style="margin-top: 5rpx;">
       <view class="{{activeState=='dzg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>待我办理（{{dzgCount}}）</text></view>
       <view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>整改完成（{{yclCount}}）</text></view>
@@ -45,14 +54,13 @@
        </view>
    </view>
 </view>
-
 <view class="inspect_add_to"  bindtap="skipAdd">
 <view style="padding-top: 22rpx;">
    <image src="../../../../images/new_add.png"></image>
    <view>新增</view>
 </view>
 </view>
-
+</view>
 
 
 

miniprogram/pageage/project_problemmodify/quality/modify/index.js

@@ -58,10 +58,12 @@ Page({
             if(res.code == 200){
                 let urls = [];
               let minUrls = [];
+              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 = [];
+              if(res.data.fileUrls){
                 res.data.fileUrls.split(',').forEach(element => {
                     urls.push(element+'.min.jpg');
                   });
+              }
               that.setData({
                 auditInfo:res.data,
                 auditImgs:urls

miniprogram/pageage/project_problemmodify/security/check/index.js

@@ -59,10 +59,12 @@ Page({
             if(res.code == 200){
               let urls = [];
               let minUrls = [];
+              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 = [];
+            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,7 +167,6 @@ Page({
   //审核驳回
   onRejectSave(){
     let that = this;
-    if(that.data.reject){
     if(that.data.rejectOpinion!=""){
       //弹出确认
       wx.showModal({
@@ -185,11 +188,6 @@ Page({
         })
         return;
     }
-    }else{
-      that.setData({
-            reject:true
-        });
-    }
   },
   //审核通过
   onPassSave(){
@@ -202,8 +200,7 @@ Page({
           if (sm.confirm) {
               // 用户点击了确定 可以调用了
               that.setData({
-                reject:false,
+                reject:false
-                rejectOpinion:""
               });
               that.onSubmitSave(4);
             } else if (sm.cancel) {

miniprogram/pageage/project_problemmodify/security/check/index.wxml

@@ -109,14 +109,14 @@
                 </view>
           </view>
     </view>
-    <view class="inspect_overview" wx:if="{{reject}}">
+    <view class="inspect_overview" wx:if="true">
             <view class="module_title module_title_padding">
-                <view>整改驳回意见</view>
+                <view>整改复检意见</view>
             </view>
             <view class="inspect_overview_list_max">
               <view class="inspect_info_list" >
                   <view class="inspect_info_content">
-                  <textarea  class="add_textarea" placeholder="请填写整改说明"
+                  <textarea  class="add_textarea" placeholder="请填写整改复检意见"
                   placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
                 </view>
               </view>

miniprogram/pageage/project_problemmodify/security/info/index.js

@@ -56,10 +56,12 @@ Page({
             if(res.code == 200){
               let urls = [];
               let minUrls = [];
+              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 = [];
+              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,

miniprogram/pageage/project_problemmodify/security/list/index.js

@@ -150,6 +150,13 @@ Page({
     this.getListData();
   },
 
+  returnToPage: function () {
+    wx.redirectTo({
+      url: '../../../../pages/gengduogongneng/gengduogongneng',
+    })
+  },
+
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

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": "安全隐患排查"
 }

miniprogram/pageage/project_problemmodify/security/list/index.wxml

@@ -1,9 +1,17 @@
- <view>   
+<view class="header_title">
- <van-sticky  offset-top="{{ 0 }}">
+  <view class="header_title_row">
-       <view  style="background: #191d28;">
+    <van-row>
-       <project-select init="{{initData}}"></project-select>
+      <van-col span="3">
+        <view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
+      </van-col>
+      <van-col span="15">
+        <view class="header_name">安全隐患排查</view>
+      </van-col>
+    </van-row>
   </view>
-</van-sticky>
+</view>
+<view class="max_content">
+   <project-select init="{{initData}}"></project-select>
 <view class="modify_video_nav" style="margin-top: 5rpx;">
       <view class="{{activeState=='dzg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>待我办理（{{dzgCount}}）</text></view>
       <view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>整改完成（{{yclCount}}）</text></view>
@@ -45,7 +53,6 @@
             </view>
        </view>
    </view>
-</view>
 <view class="inspect_add_to"  bindtap="skipAdd">
 <view style="padding-top: 22rpx;">
    <image src="../../../../images/new_add.png"></image>
@@ -53,6 +60,7 @@
 </view>
 </view>
 </view>
+</view>  
 
 
 

miniprogram/pageage/project_problemmodify/security/modify/index.js

@@ -58,10 +58,12 @@ Page({
             if(res.code == 200){
                 let urls = [];
                 let minUrls = [];
+                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 = [];
+              if(res.data.fileUrls){
                 res.data.fileUrls.split(',').forEach(element => {
                     urls.push(element+'.min.jpg');
                   });
+              }
               that.setData({
                 auditInfo:res.data,
                 auditImgs:urls

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'
     })
   },
 

miniprogram/pages/gengduogongneng/gengduogongneng.wxml

@@ -2,16 +2,15 @@
 <view class="header_title">
   <view class="header_title_row">
     <van-row>
-      <van-col span="3">
+      <!-- <van-col span="3">
         <view class="header_img" bindtap="showPopup"><image src="/images/core.png"></image></view>
-      </van-col>
+      </van-col> -->
-      <van-col span="4">
+      <van-col span="3">
         <view class="header_img" bindtap="goGCLB">
           <image src="/images/left.png"></image>
-          <text class="header_fh">返回</text>
         </view>
       </van-col>
-      <van-col span="10">
+      <van-col span="15">
         <view class="header_name">更多功能</view>
       </van-col>
     </van-row>