提交代码

miniprogram/app.js

@@ -30,8 +30,8 @@ App({
     // reqUrl:"http://wxw.ngrok.makalu.cc",
     //reqUrl:'https://jaapplets.makalu.cc',
     //reqUrl:'https://sxyanzhu.com/jhwxapp',
-    reqUrl:'https://cf.makalu.cc',
+    //reqUrl:'https://cf.makalu.cc',
-    //reqUrl:'http://127.0.0.1:8091',
+    reqUrl:'http://127.0.0.1:8091',
     uploadUrl:"https://cf.makalu.cc/wechat",
 
     //御景路数字化集成管控平台接口访问域名
@@ -57,7 +57,7 @@ App({
     value1:'省',
     value2:'市/区',
     value3:'公司',
-    projectInfoList:{},
+    projectInfoList:[],
     projectId:'',
     projectName:'',
     companyName:'',

miniprogram/pageage/project_checking/add/index.js

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

miniprogram/pageage/project_checking/add/index.json

@@ -2,5 +2,6 @@
   "usingComponents": {
       "van-overlay": "@vant/weapp/overlay/index"
   },
+  "navigationStyle":"custom",
   "navigationBarTitleText": "新增举牌验收"
 }

miniprogram/pageage/project_checking/add/index.wxml

@@ -1,5 +1,18 @@
 <!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
-<view class="inspect_info">
+<view class="header_title">
+  <view class="header_title_row">
+    <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>
+</view>
+<view class="max_content">
+    <view class="inspect_info">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>
     </view>
@@ -52,7 +65,8 @@
 <view class="problem_submit_to">
     <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
     <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onProblemSubmitSave">保存</view>
-</view> 
+</view>
+</view>
 
 <van-overlay show="{{loadShow}}">
     <view class="gif">

miniprogram/pageage/project_checking/info/index.js

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

miniprogram/pageage/project_checking/info/index.json

@@ -2,5 +2,6 @@
     "usingComponents": {
         "van-popup": "@vant/weapp/popup/index"
     },
+    "navigationStyle":"custom",
     "navigationBarTitleText": "举牌验收详情"
 }

miniprogram/pageage/project_checking/info/index.wxml

@@ -1,5 +1,17 @@
 <!--pageage/safetyManagement/problemRectification/index.wxml-->
-<view>
+<view class="header_title">
+  <view class="header_title_row">
+    <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>
+</view>
+<view class="max_content">
   <view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		  <view class="module_title module_title_padding">

miniprogram/pageage/project_checking/list/index.js

@@ -87,6 +87,15 @@ Page({
       })
     },
 
+      //项目切换 返回值
+  onProjectSelect(e){
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;  
+    this.onLoad();
+  },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

miniprogram/pageage/project_checking/list/index.wxml

@@ -11,7 +11,7 @@
   </view>
 </view>
 <view class="max_content">
-<project-select init="{{initData}}"></project-select>
+<project-select init="{{initData}}" bindchange="onProjectSelect"></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">

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

@@ -161,8 +161,8 @@ Page({
                 userNames+=","+it.userName;
             });
             this.setData({
-                copySend:phoneNumbers.substring(1),
+                copySend:userNames.substring(1),
-                copySendUser:userNames.substring(1)
+                copySendUser:phoneNumbers.substring(1)
             })
         }else{
             this.setData({
@@ -363,6 +363,13 @@ Page({
     })
   },
 
+  returnToPage: function () {
+    /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+    wx.navigateTo({
+        url: '../list/index',
+    })
+  },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

miniprogram/pageage/project_problemmodify/quality/add/index.json

@@ -2,5 +2,6 @@
   "usingComponents": {
       "van-overlay": "@vant/weapp/overlay/index"
   },
+  "navigationStyle":"custom",
   "navigationBarTitleText": "新增质量隐患"
 }

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

@@ -1,5 +1,18 @@
 <!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
-<view class="inspect_info">
+<view class="header_title">
+  <view class="header_title_row">
+    <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>
+</view>
+<view class="max_content">
+    <view class="inspect_info ">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>
     </view>
@@ -61,6 +74,7 @@
     <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
     <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onProblemSubmitSave">提交隐患</view>
 </view> 
+</view>
 
 <van-overlay show="{{loadShow}}">
     <view class="gif">

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

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

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

@@ -3,5 +3,6 @@
         "van-popup": "@vant/weapp/popup/index",
         "van-overlay": "@vant/weapp/overlay/index"
     },
+    "navigationStyle":"custom",
     "navigationBarTitleText": "质量隐患复检"
 }

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

@@ -1,4 +1,17 @@
 <!--pageage/safetyManagement/problemRectification/index.wxml-->
+<view class="header_title">
+  <view class="header_title_row">
+    <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>
+</view>
+<view class="max_content">
     <view class="inspect_overview_max">
         <view class="inspect_overview">
             <view class="module_title module_title_padding">
@@ -126,6 +139,8 @@
       <view class="problem_submit_to_btn"  bindtap="onRejectSave">整改驳回</view>
       <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onPassSave">整改通过</view>
   </view> 
+</view>
+    
   <van-overlay show="{{loadShow}}">
       <view class="gif">
           <image src="../../../../images/loding2.gif"></image>

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

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

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

@@ -1,4 +1,5 @@
 {
     "usingComponents": {},
+    "navigationStyle":"custom",
     "navigationBarTitleText": "质量隐患详情"
 }

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

@@ -1,6 +1,18 @@
 <!--pageage/safetyManagement/problemRectification/index.wxml-->
-<view>
+<view class="header_title">
-  <view class="inspect_overview_max">
+  <view class="header_title_row">
+    <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>
+</view>
+<view class="max_content">
+	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		  <view class="module_title module_title_padding">
 			  <view>{{infoData.problemArea}}</view>
@@ -127,8 +139,9 @@
 				  </van-row>
 			  </view>
 			</view>
-		</view>	  
   </view>
   <view class="problem_submit_to" wx:if="{{showDel}}">
       <view class="problem_submit_to_btn problem_submit_to_delete"  bindtap="onDelete">删除</view>
   </view> 
+</view>
+  

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

@@ -171,6 +171,15 @@ Page({
       })
     },
 
+      //项目切换 返回值
+  onProjectSelect(e){
+    let projectId = e.detail.id;
+    let projectName = e.detail.text;
+    app.globalData.projectId = projectId;
+    app.globalData.projectName = projectName;  
+    this.onLoad();
+  },
+
     /**
      * 生命周期函数--监听页面隐藏
      */

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

@@ -11,7 +11,7 @@
   </view>
 </view>
 <view class="max_content">    
-<project-select init="{{initData}}"></project-select>
+<project-select init="{{initData}}" bindchange="onProjectSelect"></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>

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

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

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

@@ -3,5 +3,6 @@
         "van-popup": "@vant/weapp/popup/index",
         "van-overlay": "@vant/weapp/overlay/index"
     },
+    "navigationStyle":"custom",
     "navigationBarTitleText": "质量隐患整改"
 }

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

@@ -1,6 +1,18 @@
 <!--pageage/safetyManagement/problemRectification/index.wxml-->
-<view>
+<view class="header_title">
-  <view class="inspect_overview_max">
+  <view class="header_title_row">
+    <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>
+</view>
+<view class="max_content">
+	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		  <view class="module_title module_title_padding">
 			  <view>{{infoData.problemArea}}</view>
@@ -118,12 +130,12 @@
 				</view>
 			</view>
 			</view>
-		</view>	  
   </view>
   <view class="problem_submit_to">
     <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
     <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onSubmitSave">保存</view>
 </view> 
+</view>
 
 <van-overlay show="{{loadShow}}">
     <view class="gif">

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

@@ -161,8 +161,8 @@ Page({
                 userNames+=","+it.userName;
             });
             this.setData({
-                copySend:phoneNumbers.substring(1),
+                copySend:userNames.substring(1),
-                copySendUser:userNames.substring(1)
+                copySendUser:phoneNumbers.substring(1)
             })
         }else{
             this.setData({
@@ -370,6 +370,13 @@ Page({
     })
   },
 
+  returnToPage: function () {
+    /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+    wx.navigateTo({
+        url: '../list/index',
+    })
+  },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

miniprogram/pageage/project_problemmodify/security/add/index.json

@@ -2,5 +2,6 @@
   "usingComponents": {
       "van-overlay": "@vant/weapp/overlay/index"
   },
+  "navigationStyle":"custom",
   "navigationBarTitleText": "新增安全隐患"
 }

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

@@ -1,5 +1,18 @@
 <!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
-<view class="inspect_info">
+<view class="header_title">
+  <view class="header_title_row">
+    <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>
+</view>
+<view class="max_content">
+    <view class="inspect_info">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>
     </view>
@@ -61,6 +74,7 @@
     <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
     <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onProblemSubmitSave">提交隐患</view>
 </view> 
+</view>
 
 <van-overlay show="{{loadShow}}">
     <view class="gif">

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

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

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

@@ -3,5 +3,6 @@
         "van-popup": "@vant/weapp/popup/index",
         "van-overlay": "@vant/weapp/overlay/index"
     },
+    "navigationStyle":"custom",
     "navigationBarTitleText": "安全隐患复检"
 }

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

@@ -1,5 +1,18 @@
 <!--pageage/safetyManagement/problemRectification/index.wxml-->
-<view class="inspect_overview_max">
+<view class="header_title">
+  <view class="header_title_row">
+    <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>
+</view>
+<view class="max_content">
+    <view class="inspect_overview_max">
         <view class="inspect_overview">
             <view class="module_title module_title_padding">
                 <view>{{infoData.problemArea}}</view>
@@ -126,6 +139,8 @@
       <view class="problem_submit_to_btn"  bindtap="onRejectSave">整改驳回</view>
       <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onPassSave">整改通过</view>
   </view> 
+</view>
+
   <van-overlay show="{{loadShow}}">
       <view class="gif">
           <image src="../../../../images/loding2.gif"></image>

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

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

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

@@ -1,4 +1,5 @@
 {
     "usingComponents": {},
+    "navigationStyle":"custom",
     "navigationBarTitleText": "安全隐患详情"
 }

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

@@ -1,6 +1,18 @@
 <!--pageage/safetyManagement/problemRectification/index.wxml-->
-<view>
+<view class="header_title">
-  <view class="inspect_overview_max">
+  <view class="header_title_row">
+    <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>
+</view>
+<view class="max_content">
+	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		  <view class="module_title module_title_padding">
 			  <view>{{infoData.problemArea}}</view>
@@ -127,10 +139,11 @@
 				  </van-row>
 			  </view>
 			</view>
-		</view>	  
   </view>
   <view class="problem_submit_to" wx:if="{{showDel}}">
 	  
       <view class="problem_submit_to_btn problem_submit_to_delete"  bindtap="onDelete">
 	  删除</view>
   </view> 
+</view>
+ 

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

@@ -156,6 +156,14 @@ Page({
     })
   },
 
+    //项目切换 返回值
+    onProjectSelect(e){
+      let projectId = e.detail.id;
+      let projectName = e.detail.text;
+      app.globalData.projectId = projectId;
+      app.globalData.projectName = projectName;  
+      this.onLoad();
+    },
 
     /**
      * 生命周期函数--监听页面初次渲染完成

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

@@ -11,7 +11,7 @@
   </view>
 </view>
 <view class="max_content">
-   <project-select init="{{initData}}"></project-select>
+   <project-select init="{{initData}}" bindchange="onProjectSelect"></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>

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

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

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

@@ -3,5 +3,6 @@
         "van-popup": "@vant/weapp/popup/index",
         "van-overlay": "@vant/weapp/overlay/index"
     },
+    "navigationStyle":"custom",
     "navigationBarTitleText": "安全隐患整改"
 }

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

@@ -1,6 +1,18 @@
 <!--pageage/safetyManagement/problemRectification/index.wxml-->
-<view>
+<view class="header_title">
-  <view class="inspect_overview_max">
+  <view class="header_title_row">
+    <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>
+</view>
+<view class="max_content">
+	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		  <view class="module_title module_title_padding">
 			  <view>{{infoData.problemArea}}</view>
@@ -117,12 +129,12 @@
 				</view>
 			</view>
 			</view>
-		</view>	  
   </view>
   <view class="problem_submit_to">
     <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
     <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onSubmitSave">保存</view>
 </view> 
+</view>
 
 <van-overlay show="{{loadShow}}">
     <view class="gif">

miniprogram/pages/components/project-select/index.js

@@ -38,29 +38,35 @@ Component({
 
   created(){
     //this.getProjectNameList();
+    this.setData({
+      projectList:app.globalData.projectInfoList
+    })
   },
   /**
    * 组件的方法列表
    */
   methods: {
     showPopup() {
-      // var data = this.data.projectList;
+      if(this.data.projectList.length>1){
-      // var initData = this.data.init
+        let data = this.data.projectList;
-      // for(var i=0;i<data.length;i++ ){
+        let initData = this.data.init;
-      //     if(data[i].id == initData.id){
+        let selectColumns = [];
-      //         this.setData({
+        data.forEach((item,i) =>{
-      //           index:i
+          selectColumns.push({id:item.projectId,text:item.projectName});
-      //         })
+          if(initData.id==item.projectId){
-      //         break
+            this.setData({
-      //     }
+              index:i
-      // }
+            })
-
+          }
-      // console.log(this.data.index)
+        });
-      // this.setData({
+        console.log("default-index="+this.data.index);
-      //     columns:data,
+        this.setData({
-      //     show: true 
+            columns:selectColumns,
-      // });
+            show: true 
+        });
+      }
     },
+
     onClose() {
       this.setData({ show: false });
     },

miniprogram/pages/gengduogongneng/gengduogongneng.wxml

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

miniprogram/pages/gongchengliebiao/gongchengliebiao.js

@@ -465,7 +465,8 @@ Page({
           proCount:res.data.length,
           projectData:res.data,
           projectInfoList:res.data
-        })  
+        })
+        app.globalData.projectInfoList =  res.data; 
         //if(that.data.type == 1){
         //  that.setData({
         //    proCount:res.data.length,
@@ -584,7 +585,7 @@ Page({
     //赋值到公共参数
     app.globalData.projectId = even.currentTarget.dataset['id'];
     app.globalData.projectName = even.currentTarget.dataset['name'];
-    app.globalData.projectInfoList = JSON.stringify(this.data.projectInfoList);
+    //app.globalData.projectInfoList = JSON.stringify(this.data.projectInfoList);
     app.globalData.type = this.data.type;
     app.globalData.value1 = this.data.value1;
     app.globalData.value2 = this.data.value2;

miniprogram/pages/login/login.js

@@ -105,7 +105,8 @@ Page({
             //赋值到公共参数
             app.globalData.projectId = rd.projectInfo.projectId;
             app.globalData.projectName = rd.projectInfo.projectName;
-            app.globalData.projectInfoList = rd.projectInfo.projectInfoList;
+            app.globalData.projectInfoList = [];
+            app.globalData.projectInfoList.push(rd.projectInfo);
             app.globalData.value1 = rd.projectInfo.shengName;
             app.globalData.value2 = rd.projectInfo.shiName+'/'+rd.projectInfo.quName;
             app.globalData.value3 = rd.projectInfo.logCompanyName;
@@ -171,7 +172,8 @@ Page({
               //赋值到公共参数
               app.globalData.projectId = rd.projectInfo.projectId;
               app.globalData.projectName = rd.projectInfo.projectName;
-              app.globalData.projectInfoList = rd.projectInfo.projectInfoList;
+              app.globalData.projectInfoList = [];
+              app.globalData.projectInfoList.push(rd.projectInfo);
               app.globalData.value1 = rd.projectInfo.shengName;
               app.globalData.value2 = rd.projectInfo.shiName+'/'+rd.projectInfo.quName;
               app.globalData.value3 = rd.projectInfo.logCompanyName;

miniprogram/pages/map/map.js

@@ -474,7 +474,8 @@ Page({
             scale:5,
             initialLon:res.data[0].longitude,
             initialLat:res.data[0].latitude,
-          }) 
+          })
+          app.globalData.projectInfoList =  res.data;
         }else{
           that.setData({
             markers:res.data,
@@ -616,7 +617,7 @@ Page({
       //赋值到公共参数
       app.globalData.projectId = this.data.markers[even.markerId].projectId;
       app.globalData.projectName = this.data.markers[even.markerId].projectName;
-      app.globalData.projectInfoList = JSON.stringify(projectData);
+      //app.globalData.projectInfoList = JSON.stringify(projectData);
       app.globalData.type = 1;
       app.globalData.value1 = value1;
       app.globalData.value2 = value2;
@@ -651,7 +652,7 @@ Page({
       value3 = '公司';
     }
     //添加数据到app.js文件固定参数
-    app.globalData.projectInfoList = JSON.stringify(projectData);
+    //app.globalData.projectInfoList = JSON.stringify(projectData);
     app.globalData.type = 1;
     app.globalData.value1 = value1;
     app.globalData.value2 = value2;
@@ -683,7 +684,7 @@ Page({
       value3 = '公司';
     }
     //添加数据到app.js文件固定参数
-    app.globalData.projectInfoList = JSON.stringify(environProjectData);
+    //app.globalData.projectInfoList = JSON.stringify(environProjectData);
     app.globalData.type = 2;
     app.globalData.value1 = value1;
     app.globalData.value2 = value2;

miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js

@@ -309,7 +309,6 @@ Page({
       projectId:projectId,
       projectName:projectName
     })
-
     this.onLoad();
   },
 
@@ -373,7 +372,7 @@ Page({
   },
 
   onClickShow() {
-    this.setData({ loadShow: true });
+    this.setData({ loadShow: false });
   },
 
   onClickHide() {
@@ -439,7 +438,7 @@ Page({
         id:even
       },
       success:resData=> {
-          this.onClickHide();
+          this.onClickHide()
           this.setData({
             projectInfo:resData.data
           })
@@ -481,8 +480,8 @@ Page({
             projectId:projectId
         },
         success:resData=> {
-            that.onClickHide();
+            that.onClickHide()
-            this.setData ({
+            that.setData ({
                 projectUnitsList:resData.data           
             })
         }