From 0ad28dbac74ba51b604c31c2dee7494d4e7f8fe4 Mon Sep 17 00:00:00 2001
From: hailu <962012470@qq.com>
Date: 星期一, 27 十一月 2023 17:21:15 +0800
Subject: [PATCH] 安装流程

---
 GoldC/pages/maintenance/maintenance.wxml     |    6 
 GoldC/pages/login/login.js                   |    2 
 GoldC/pages/problemList/problemList.wxml     |   81 ++---
 GoldC/pages/person/person.js                 |    2 
 GoldC/app.json                               |   21 +
 GoldC/pages/problemReport/proRep.js          |  256 +++++++++++++++++
 GoldC/pages/problemList/problemList.js       |  159 ++++++++++
 GoldC/project.config.json                    |   16 
 GoldC/pages/Remind/Remind.wxml               |    4 
 GoldC/pages/home/home.js                     |   68 +++-
 GoldC/pages/problemReport/proRep.wxml        |   40 +-
 GoldC/pages/devicelogs/devicelogs.json       |    7 
 GoldC/pages/devicelogs/devicelogs.wxml       |   10 
 GoldC/pages/devicelogs/devicelogs.wxss       |   15 +
 GoldC/pages/problemListT3/ProblemListT3.wxml |    8 
 GoldC/pages/devicelogs/devicelogs.js         |  121 ++++++++
 GoldC/pages/xiangqing/xiangqing.wxml         |    2 
 17 files changed, 681 insertions(+), 137 deletions(-)

diff --git a/GoldC/app.json b/GoldC/app.json
index e760c06..d2dc829 100644
--- a/GoldC/app.json
+++ b/GoldC/app.json
@@ -15,12 +15,16 @@
     "pages/fixpwd/fixpwd",
     "pages/xiangqing/xiangqing",
     "pages/baidumap/bmap",
-    "pages/maintenance/maintenance"
+    "pages/maintenance/maintenance",
+    "pages/devicelogs/devicelogs"
   ],
   "permission": {
+    "scope.userLocation": {
+      "desc": "浣犵殑浣嶇疆淇℃伅灏嗙敤浜庡皬绋嬪簭浣嶇疆鎺ュ彛鐨勬晥鏋滃睍绀�"
+    }
   },
-  "requiredPrivateInfos": [ 
-   
+  "requiredPrivateInfos": [
+    "chooseLocation"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -29,11 +33,12 @@
     "navigationBarTextStyle": "black",
     "enablePullDownRefresh": false
   },
+
+
   "tabBar": {
     "color": "#8a8a8a",
     "selectedColor": "#1296db",
-    "list": [
-      {
+    "list": [{
         "pagePath": "pages/home/home",
         "text": "棣栭〉",
         "iconPath": "/images/home(1).png",
@@ -47,6 +52,12 @@
       }
     ]
   },
+  "plugins": {
+    "routePlan": {
+      "version": "1.0.19",
+      "provider": "wx50b5593e81dd937a"
+    }
+  },
   "style": "v2",
   "sitemapLocation": "sitemap.json"
 }
\ No newline at end of file
diff --git a/GoldC/pages/Remind/Remind.wxml b/GoldC/pages/Remind/Remind.wxml
index 6ae0f58..5dd623f 100644
--- a/GoldC/pages/Remind/Remind.wxml
+++ b/GoldC/pages/Remind/Remind.wxml
@@ -59,7 +59,7 @@
 				<view class="body">
 					<view class="h2txt"><image class="primg" src="/images/ProRep/pingding.png"></image>璇勫畾椤圭洰锛�</view>
 					<view class="text">{{item.ManagementName}}</view>
-					<view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>闂鎻忚堪锛�</view>
+					<view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>璁㈠崟璇︽儏锛�</view>
 					<view class="text">{{item.Reported_Question}}</view>
 					<!-- <view class="h2txt">闂鍥剧墖锛�</view>	 -->
 					<view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view>
@@ -124,7 +124,7 @@
 				<view class="body">
 					<view class="h2txt">闂鍒嗙被锛�</view>
 					<view class="text">{{item.ManagementName}}</view>
-					<view class="h2txt">闂鎻忚堪锛�</view>
+					<view class="h2txt">璁㈠崟璇︽儏锛�</view>
 					<view class="text">{{item.Reported_Question}}</view>
 					<!-- <view class="h2txt">闂鍥剧墖锛�</view>	 -->
 					<view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view>
diff --git a/GoldC/pages/devicelogs/devicelogs.js b/GoldC/pages/devicelogs/devicelogs.js
new file mode 100644
index 0000000..83e6325
--- /dev/null
+++ b/GoldC/pages/devicelogs/devicelogs.js
@@ -0,0 +1,121 @@
+// pages/repair/repair.js
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    deviceInfo: {},
+    deviceDetail: {},
+    marker: []
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad(options) {
+    this.setData({
+      deviceDetail:JSON.parse(options.address)
+    })
+    console.log(this.data.deviceDetail);
+    var marker = [{
+      id:0,
+      latitude: this.data.deviceDetail.lat,
+      longitude: this.data.deviceDetail.lng,
+      iconPath: '../../images/ProRep/weizhi.png',
+      width: '50rpx',
+      height: "50rpx",
+      callout: {
+        color: '#000000',
+        content: this.data.deviceDetail.name,
+        fontSize: 12,
+        borderRadius: 5,
+        bgColor: '#ffffff',
+        padding: 10,
+        textAlign: 'center',
+        display: "ALWAYS"
+        // anchorY:-18
+      }
+    }]
+
+    this.setData({
+      marker: marker
+    })
+    // let address = JSON.parse(options.address)
+    // console.log(address);
+    // this.setData({
+    //   deviceInfo: deviceInfo
+    // })
+    // wx.setNavigationBarTitle({
+    //   title: deviceInfo.deviceName //椤甸潰鍒囨崲锛屾洿鎹㈤〉闈㈡爣棰�
+    // })
+    // this.getDeviceInfo()
+
+  },
+  
+  goMap() {
+    let plugin = requirePlugin('routePlan');
+    let key = 'SRGBZ-FLCKU-2TIVH-BFHUM-D5CTO-LFBHQ';  //浣跨敤鍦ㄨ吘璁綅缃湇鍔＄敵璇风殑key
+    let referer = '楂樺痉鍦板浘';   //璋冪敤鎻掍欢鐨刟pp鐨勫悕绉�
+    let endPoint = JSON.stringify({  //缁堢偣
+      'name': this.data.deviceDetail.address,
+      'latitude': this.data.deviceDetail.lat,
+      'longitude': this.data.deviceDetail.lng
+    });
+    console.log(endPoint);
+    wx.navigateTo({
+      url: 'plugin://routePlan/index?key=' + key + '&referer=' + referer + '&endPoint=' + endPoint
+    });
+
+  },
+
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/GoldC/pages/devicelogs/devicelogs.json b/GoldC/pages/devicelogs/devicelogs.json
new file mode 100644
index 0000000..5ba4c2f
--- /dev/null
+++ b/GoldC/pages/devicelogs/devicelogs.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+  },
+  "navigationBarTitleText": "璁惧鏃ュ織",
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#007CFE"
+}
\ No newline at end of file
diff --git a/GoldC/pages/devicelogs/devicelogs.wxml b/GoldC/pages/devicelogs/devicelogs.wxml
new file mode 100644
index 0000000..38e0d93
--- /dev/null
+++ b/GoldC/pages/devicelogs/devicelogs.wxml
@@ -0,0 +1,10 @@
+<view class="title">
+  <image class="primg" src="/images/ProRep/weizhi.png"></image>
+  鍦板浘瀹氫綅锛�
+</view>
+<view class="map">
+  <map style="width:100%;height:100%" latitude="{{deviceDetail.lat}}" longitude="{{deviceDetail.lng}}" markers="{{marker}}"></map>
+</view>
+<view bind:tap="goMap" style=" background-color: #1E90FF;color: white;width: 94%;text-align: center;height: 40px;line-height: 40px;margin-left:3% ;margin-top: 20px;border-radius: 5px;">
+  鍦板浘瀵艰埅
+</view>
\ No newline at end of file
diff --git a/GoldC/pages/devicelogs/devicelogs.wxss b/GoldC/pages/devicelogs/devicelogs.wxss
new file mode 100644
index 0000000..c61ef7a
--- /dev/null
+++ b/GoldC/pages/devicelogs/devicelogs.wxss
@@ -0,0 +1,15 @@
+.title{
+  color: #000000;
+  font-size: 30rpx;
+  margin-top: 15rpx;
+  font-weight: 700;
+}
+.map{
+  width: 100%;
+  height: 450rpx;
+}
+.primg{
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 10rpx;
+}
\ No newline at end of file
diff --git a/GoldC/pages/home/home.js b/GoldC/pages/home/home.js
index e7b6673..c7c1a9c 100644
--- a/GoldC/pages/home/home.js
+++ b/GoldC/pages/home/home.js
@@ -9,8 +9,8 @@
   data: {
     showone: false,
     showtwo: false,
-    newsnum:0,
-    roleKey:'',
+    newsnum: 0,
+    roleKey: false,
   },
   // 璺宠浆鍒伴棶棰樺垪琛� 锛堢鐞嗗憳锛�
   toProblemList() {
@@ -18,7 +18,7 @@
       url: '/pages/problemList/problemList',
     })
   },
-  toMaintenanceList(){
+  toMaintenanceList() {
     wx.navigateTo({
       url: '/pages/maintenance/maintenance',
     })
@@ -33,8 +33,11 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad: function (options) {
-   
+    // console.log(options);
+
     var user = wx.getStorageSync('user')
+
+    console.log(this.data.roleKey);
     switch (user.RoleValue) {
       case 1:
         this.setData({
@@ -42,10 +45,10 @@
         })
         break;
       case 3:
-          this.setData({
-            showone: true
-          })
-          break;
+        this.setData({
+          showone: true
+        })
+        break;
       case 6:
         this.setData({
           showone: true
@@ -81,17 +84,44 @@
   onReady: function () {
 
   },
+  getInfo() {
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/getInfo',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          // let data = JSON.parse(JSON.stringify(res.data))
+          // let erectoId = data.user.userId
 
+          console.log(res.data.user.userId);
+          wx.setStorageSync('userInfo', res.data)
+          wx.setStorageSync('roleKey', res.data.user.roles[0].roleKey)
+          wx.setStorageSync('nickName',res.data.user.nickName)
+          this.setData({
+            roleKey:res.data.user.roles[0].roleKey
+          })
+          wx.setStorageSync('deptId', res.data.user.dept.deptId)
+          wx.setStorageSync('erectoId', res.data.user.userId)
+          // console.log(wx.getStorageInfoSync('erectoId'));
+        }
+      }
+    })
+  },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
   onShow: function () {
-    this.setData({
-      roleKey:wx.getStorageSync('roleKey')
-    })
-
     var user = wx.getStorageSync('user')
-
+    this.getInfo()
     switch (user.RoleValue) {
       case 1:
         this.setData({
@@ -100,11 +130,11 @@
         })
         break;
       case 3:
-          this.setData({
-            showone: true,
-            showtwo: false
-          })
-          break;
+        this.setData({
+          showone: true,
+          showtwo: false
+        })
+        break;
       case 6:
         this.setData({
           showone: true,
@@ -124,7 +154,7 @@
         })
         break;
     }
-  
+
   },
 
   /**
diff --git a/GoldC/pages/login/login.js b/GoldC/pages/login/login.js
index 400ba50..39219d6 100644
--- a/GoldC/pages/login/login.js
+++ b/GoldC/pages/login/login.js
@@ -68,7 +68,7 @@
           title: '鐧诲綍鎴愬姛锛�',
           icon: 'none'
         });
-        this.getInfo()
+        // this.getInfo()
         app.setUser(res.data)
         wx.hideLoading({
           success: (res) => {
diff --git a/GoldC/pages/maintenance/maintenance.wxml b/GoldC/pages/maintenance/maintenance.wxml
index f9d7ab3..434bd18 100644
--- a/GoldC/pages/maintenance/maintenance.wxml
+++ b/GoldC/pages/maintenance/maintenance.wxml
@@ -34,7 +34,7 @@
 					<view class="text">{{item.ManagementName}}</view>
 					<view class="h2txt">
 						<image class="primg" src="/images/ProRep/uptext.png"></image>
-					闂鎻忚堪锛�</view>
+					璁㈠崟璇︽儏锛�</view>
 					<view class="text">{{item.Reported_Question}}</view>
 					<view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view>
 					<!-- <view class="h2txt">闂鍥剧墖锛�</view> -->
@@ -91,7 +91,7 @@
 					<view class="text">{{item.ManagementName}}</view>
 					<view class="h2txt">
 					<image class="primg" src="/images/ProRep/uptext.png"></image>
-					闂鎻忚堪锛�</view>
+					璁㈠崟璇︽儏锛�</view>
 					<view class="text">{{item.Reported_Question}}</view>
 					<!-- <view class="h2txt">闂鍥剧墖锛�</view> -->
 					<view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view>
@@ -142,7 +142,7 @@
 					<view class="text">{{item.ManagementName}}</view>
 					<view class="h2txt">
 					<image class="primg" src="/images/ProRep/uptext.png"></image>
-					闂鎻忚堪锛�</view>
+					璁㈠崟璇︽儏锛�</view>
 					<view class="text">{{item.Reported_Question}}</view>
 					<!-- <view class="h2txt">闂鍥剧墖锛�</view> -->
 					<view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view>
diff --git a/GoldC/pages/person/person.js b/GoldC/pages/person/person.js
index 3d727f2..1ce76aa 100644
--- a/GoldC/pages/person/person.js
+++ b/GoldC/pages/person/person.js
@@ -99,7 +99,7 @@
           })
           if(res.data.data.avatar){
             this.setData({
-              imgHeader:'https://puyue.yhupai.com/prod-api/'+res.data.data.avatar
+              imgHeader:'https://puyue.yhupai.com/prod-api'+res.data.data.avatar
             })
           }
         }
diff --git a/GoldC/pages/problemList/problemList.js b/GoldC/pages/problemList/problemList.js
index e683c5f..c463d0f 100644
--- a/GoldC/pages/problemList/problemList.js
+++ b/GoldC/pages/problemList/problemList.js
@@ -22,12 +22,12 @@
     show: false,
     text: '',
     itemId: '',
-
+    modalHidden: true,
+    delModal: true,
     // currentIndex:1,
     // totalPage:0,
     index: 1,
     total: 10,
-
     pageMask: false,
     prevBtnDis: true,
     nextBtnDis: false,
@@ -40,6 +40,10 @@
         type: Number
       }
     },
+    form: {
+    },
+    nickName:'',
+
   },
   lifetimes: {
     // 鍦ㄧ粍浠跺疄渚嬭繘鍏ラ〉闈㈣妭鐐规爲鏃舵墽琛�
@@ -63,6 +67,8 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad: function (options) {
+    
+
   },
   // 璁剧疆寮傛璇锋眰涔嬪悗鐨勯〉闈€�佹�昏褰曟暟
   setPage(index, total) {
@@ -140,6 +146,7 @@
     this.setData({
       state: e.detail.index,
       active1: e.detail.index,
+      nickName:wx.getStorageSync('nickName')
     })
     this.getList()
   },
@@ -206,8 +213,8 @@
           this.setData({
             listdata: data.rows,
             total: total,
-            showPage:true,
-            showNull:false
+            showPage: true,
+            showNull: false
           })
           console.log(this.data.listdata)
           wx.hideLoading()
@@ -216,8 +223,8 @@
           this.setData({
             listdata: [],
             total: 0,
-            showPage:false,
-            showNull:true
+            showPage: false,
+            showNull: true
           })
           wx.hideLoading()
         }
@@ -272,16 +279,149 @@
     // wx.showLoading({
     //   title: '鍔犺浇涓�',
     // })
+    this.setData({
+      nickName:wx.getStorageSync('nickName')
+    })
     this.getErectoListLevel()
     this.getList()
   },
-  statements(e){
+  edit(e) {
     console.log(e);
-    var item=e.currentTarget.dataset.base
+    var item = e.currentTarget.dataset.base
     wx.navigateTo({
-      url: '/pages/problemReport/proRep?info='+JSON.stringify(item),
+      url: '/pages/problemReport/proRep?info=' + JSON.stringify(item),
+    })
+  },
+  statements(e) {
+    console.log(e);
+    let item = JSON.parse(JSON.stringify(e.currentTarget.dataset.base))
+    console.log(item);
+    item.state = 3
+    console.log(item);
+    wx.navigateTo({
+      url: '/pages/problemReport/proRep?info=' + JSON.stringify(item),
+    })
+  },
+  goAddress(e) {
+    var address = e.currentTarget.dataset.base.address
+    console.log(e.currentTarget.dataset);
+    wx.request({
+      url: 'https://apis.map.qq.com/ws/geocoder/v1/',
+      data: {
+        address: address,
+        key: 'SRGBZ-FLCKU-2TIVH-BFHUM-D5CTO-LFBHQ'
+      },
+      success: function (res) {
+        console.log(res.data.result.location);  // 鎵撳嵃鍑虹粡绾害
+        let params = res.data.result.location
+        params.name = e.currentTarget.dataset.base.userName
+        params.address = e.currentTarget.dataset.base.address
+        console.log(params);
+        wx.navigateTo({
+          url: '/pages/devicelogs/devicelogs?address=' + JSON.stringify(params),
+        })
+
+      }
+    });
+  },
+  jd(e) {
+    var item = e.currentTarget.dataset.base
+    this.setData({
+      modalHidden: false,
+      form: item
+    })
+  },
+  getreceiveTime() {
+    let date = new Date();
+    let year = date.getFullYear();
+    let month = date.getMonth() + 1;
+    let day = date.getDate();
+    let hour = date.getHours();
+    let minute = date.getMinutes();
+    let second = date.getSeconds();
+
+    return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day} ${hour < 10 ? '0' + hour : hour}:${minute < 10 ? '0' + minute : minute}:${second < 10 ? '0' + second : second}`;
+
+    
+  },
+  modalChange() {
+    this.data.form.state = 2
+    let data = this.data.form
+    data.id = this.data.form.id
+    data.receiveTime=this.getreceiveTime()
+    // console.log(this.data.form);
+    // return
+    // data.receiveTime=this.getreceiveTime()
+      wx.request({
+        url: 'https://puyue.yhupai.com/prod-api/iot/deviceOrder',
+        method: "PUT",
+        header: {
+          "Access-Control-Allow-Headers": 'token',
+          Authorization: `Bearer ${wx.getStorageSync('token')}`
+        },
+        data: data,
+        success: (res, header) => {
+          if (res.data.code == 200) {
+            this.setData({
+              index: 1,
+              modalHidden: true
+            })
+            this.getList()
+          } else {
+            this.setData({
+              index: 1,
+              modalHidden: true
+            })
+            this.getList()
+          }
+        }
+      })
+
+
+  },
+  modalCancel() {
+    this.setData({
+      modalHidden: true
+    })
+  },
+  delAZ(e) {
+    console.log(e);
+    var item = e.currentTarget.dataset.base
+    this.setData({
+      delModal: false,
+      form: item
     })
 
+  },
+  DelChange() {
+    wx.request({
+      url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder/${this.data.form.id}`,
+      method: "DELETE",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      success: (res, header) => {
+        if (res.data.code == 200) {
+          this.setData({
+            index: 1,
+            delModal: true
+          })
+          this.getList()
+        } else {
+          this.setData({
+            index: 1,
+            delModal: true
+          })
+          this.getList()
+        }
+      }
+    })
+  },
+  DelCancel() {
+    this.setData({
+      delModal: true
+    })
   },
 
   /**
@@ -295,7 +435,6 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
    */
   onUnload: function () {
-    // console.log(111111111)
     wx.switchTab({
       url: '/pages/home/home',
     })
diff --git a/GoldC/pages/problemList/problemList.wxml b/GoldC/pages/problemList/problemList.wxml
index 532e0b7..0100f15 100644
--- a/GoldC/pages/problemList/problemList.wxml
+++ b/GoldC/pages/problemList/problemList.wxml
@@ -33,7 +33,7 @@
   <!-- 宸蹭笂鎶� -->
   <van-tab title="鏈淳鍗�">
     <view class="listBox">
-      <view class="list" wx:for="{{listdata}}">
+      <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
         <view class="heard">
           <view class="htext">{{item.device.deviceName}}</view>
         </view>
@@ -46,7 +46,7 @@
           <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}}</view>
           <view class="h2txt">
             <image class="primg" src="/images/ProRep/uptext.png"></image>
-            闂鎻忚堪锛�
+            璁㈠崟璇︽儏锛�
           </view>
           <view class="text">{{item.remark?item.remark:'--'}}</view>
           <!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view> -->
@@ -57,7 +57,7 @@
           <!--  -->
 
           <!--  -->
-          <view class="address">
+          <view class="address" data-base='{{item}}' bind:tap="goAddress">
             <image class="timeicon" src="/images/address.png"></image>
             <text>{{item.address}}</text>
           </view>
@@ -69,15 +69,16 @@
         <view class="footer">
           <view class="libtn">
             <!-- 淇敼 -->
-            <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}">
+            <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="edit">
               <van-icon name="edit" class="icon" />
               <text>淇敼</text>
             </view>
           </view>
           <view class="libtn">
-            <!-- 鍒犻櫎 -->
-            <view class="btn btn-del" bindtap="del" data-id="{{item.pk_Examine}}" wx:if="{{roleKey!=='tenantservice'}}">
-              <van-icon name="delete" class="icon" /><text>鍒犻櫎</text>
+
+            <view class="btn btn-del" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="delAZ">
+              <van-icon name="delete" class="icon" />
+              <text>鍒犻櫎</text>
             </view>
           </view>
         </view>
@@ -87,7 +88,7 @@
   <!-- 澶勭悊涓� -->
   <van-tab title="宸叉淳鍗�">
     <view class="listBox">
-      <view class="list" wx:for="{{listdata}}">
+      <view class="list" wx:for="{{listdata}}" wx:for-item="item">
         <view class="heard">
           <view class="htext">{{item.device.deviceName}}</view>
         </view>
@@ -100,18 +101,10 @@
           <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}}</view>
           <view class="h2txt">
             <image class="primg" src="/images/ProRep/uptext.png"></image>
-            闂鎻忚堪锛�
+            璁㈠崟璇︽儏锛�
           </view>
           <view class="text">{{item.remark?item.remark:'--'}}</view>
-          <!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view> -->
-          <!-- <view class="h2txt">闂鍥剧墖锛�</view> -->
-          <!-- <view style="padding-left: 30rpx;">
-            <image wx:for="{{item.Reported_ImgArray}}" wx:for-item="imgitem" class="quImg" style="{{item.loading?'display:block':'display:none'}}" bindload="imgOnLoad" data-index="{{index}}" data-imgindex="{{imgitem}}" mode="aspectFill" src="{{'http://47.92.31.84:8088'+ imgitem}}" bindtap="imgYu" data-img="{{'http://47.92.31.84:8088'+ imgitem}}"></image>
-          </view> -->
-          <!--  -->
-
-          <!--  -->
-          <view class="address">
+          <view class="address" data-base='{{item}}' bind:tap="goAddress">
             <image class="timeicon" src="/images/address.png"></image>
             <text>{{item.address}}</text>
           </view>
@@ -123,15 +116,15 @@
         <view class="footer">
           <view class="libtn">
             <!-- 淇敼 -->
-            <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}">
+            <view class="btn btn-adit" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="edit">
               <van-icon name="edit" class="icon" />
               <text>淇敼</text>
             </view>
           </view>
-          <view class="libtn">
-            <!-- 鍒犻櫎 -->
-            <view class="btn btn-del" bindtap="del" data-id="{{item.pk_Examine}}" wx:if="{{roleKey!=='tenantservice'}}">
-              <van-icon name="delete" class="icon" /><text>鍒犻櫎</text>
+          <view class="libtn" wx:if="{{item.erectoName==nickName}}">
+            <view class="btn btn-adit" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="jd">
+              <van-icon name="edit" class="icon" />
+              <text>鎺ュ崟</text>
             </view>
           </view>
         </view>
@@ -141,7 +134,7 @@
   <!-- 寰呭鏍� -->
   <van-tab title="宸叉帴鍗�">
     <view class="listBox">
-      <view class="list" wx:for="{{listdata}}"  wx:for-item='item'>
+      <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
         <view class="heard">
           <view class="htext">{{item.device.deviceName}}</view>
         </view>
@@ -154,18 +147,10 @@
           <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}}</view>
           <view class="h2txt">
             <image class="primg" src="/images/ProRep/uptext.png"></image>
-            闂鎻忚堪锛�
+            璁㈠崟璇︽儏锛�
           </view>
           <view class="text">{{item.remark?item.remark:'--'}}</view>
-          <!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view> -->
-          <!-- <view class="h2txt">闂鍥剧墖锛�</view> -->
-          <!-- <view style="padding-left: 30rpx;">
-            <image wx:for="{{item.Reported_ImgArray}}" wx:for-item="imgitem" class="quImg" style="{{item.loading?'display:block':'display:none'}}" bindload="imgOnLoad" data-index="{{index}}" data-imgindex="{{imgitem}}" mode="aspectFill" src="{{'http://47.92.31.84:8088'+ imgitem}}" bindtap="imgYu" data-img="{{'http://47.92.31.84:8088'+ imgitem}}"></image>
-          </view> -->
-          <!--  -->
-
-          <!--  -->
-          <view class="address">
+          <view class="address" data-base='{{item}}' bind:tap="goAddress">
             <image class="timeicon" src="/images/address.png"></image>
             <text>{{item.address}}</text>
           </view>
@@ -177,15 +162,9 @@
         <view class="footer">
           <view class="libtn">
             <!-- 淇敼 -->
-            <view class="btn btn-adit"  data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="statements">
+            <view class="btn btn-adit" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="statements">
               <van-icon name="edit" class="icon" />
               <text>缁撳崟</text>
-            </view>
-          </view>
-          <view class="libtn">
-            <!-- 鍒犻櫎 -->
-            <view class="btn btn-del" bindtap="del" data-id="{{item.pk_Examine}}" wx:if="{{roleKey!=='tenantservice'}}">
-              <van-icon name="delete" class="icon" /><text>鍒犻櫎</text>
             </view>
           </view>
         </view>
@@ -208,7 +187,7 @@
           <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}}</view>
           <view class="h2txt">
             <image class="primg" src="/images/ProRep/uptext.png"></image>
-            闂鎻忚堪锛�
+            璁㈠崟璇︽儏锛�
           </view>
           <view class="text">{{item.remark?item.remark:'--'}}</view>
           <!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view> -->
@@ -219,7 +198,8 @@
           <!--  -->
 
           <!--  -->
-          <view class="address">
+          <view class="address" data-base='{{item}}' bind:tap="goAddress">
+
             <image class="timeicon" src="/images/address.png"></image>
             <text>{{item.address}}</text>
           </view>
@@ -234,12 +214,6 @@
             <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}">
               <van-icon name="edit" class="icon" />
               <text>淇敼</text>
-            </view>
-          </view>
-          <view class="libtn">
-            <!-- 鍒犻櫎 -->
-            <view class="btn btn-del" bindtap="del" data-id="{{item.pk_Examine}}" wx:if="{{roleKey!=='tenantservice'}}">
-              <van-icon name="delete" class="icon" /><text>鍒犻櫎</text>
             </view>
           </view>
         </view>
@@ -267,4 +241,11 @@
       </view>
     </view>
   </view>
-</view>
\ No newline at end of file
+</view>
+
+<modal title="鎺ュ崟" confirm-text="纭" cancel-text="鍙栨秷" hidden="{{modalHidden}}" bindconfirm="modalChange" bindcancel="modalCancel">
+  鏄惁纭鎺ュ崟?姝ゆ搷浣滀笉鍙仮澶�!
+</modal>
+<modal title="鍒犻櫎璁㈠崟" confirm-text="纭" cancel-text="鍙栨秷" hidden="{{delModal}}" bindconfirm="DelChange" bindcancel="DelCancel">
+  鏄惁鍒犻櫎姝よ鍗�?姝ゆ搷浣滀笉鍙仮澶�!
+</modal>
\ No newline at end of file
diff --git a/GoldC/pages/problemListT3/ProblemListT3.wxml b/GoldC/pages/problemListT3/ProblemListT3.wxml
index 0cf1efd..c155613 100644
--- a/GoldC/pages/problemListT3/ProblemListT3.wxml
+++ b/GoldC/pages/problemListT3/ProblemListT3.wxml
@@ -52,7 +52,7 @@
 				<view class="body">
 					<view class="h2txt"><image class="primg" src="/images/ProRep/pingding.png"></image>璇勫畾椤圭洰锛�</view>
 					<view class="text">{{item.ManagementName}}</view>
-					<view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>闂鎻忚堪锛�</view>
+					<view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>璁㈠崟璇︽儏锛�</view>
 					<view class="text">{{item.Reported_Question}}</view>
 					<!-- <view class="h2txt">闂鍥剧墖锛�</view>	 -->
 					<view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view>
@@ -109,7 +109,7 @@
 				<view class="body">
 					<view class="h2txt"><image class="primg" src="/images/ProRep/pingding.png"></image>璇勫畾椤圭洰锛�</view>
 					<view class="text">{{item.ManagementName}}</view>
-					<view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>闂鎻忚堪锛�</view>
+					<view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>璁㈠崟璇︽儏锛�</view>
 					<view class="text">{{item.Reported_Question}}</view>
 					<!-- <view class="h2txt">闂鍥剧墖锛�</view>	 -->
 					<view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view>
@@ -160,7 +160,7 @@
 				<view class="body">
 					<view class="h2txt"><image class="primg" src="/images/ProRep/pingding.png"></image>璇勫畾椤圭洰锛�</view>
 					<view class="text">{{item.ManagementName}}</view>
-					<view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>闂鎻忚堪锛�</view>
+					<view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>璁㈠崟璇︽儏锛�</view>
 					<view class="text">{{item.Reported_Question}}</view>
 					<!-- <view class="h2txt">闂鍥剧墖锛�</view>	 -->
 					<view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view>
@@ -202,7 +202,7 @@
 				<view class="body">
 					<view class="h2txt"><image class="primg" src="/images/ProRep/pingding.png"></image>璇勫畾椤圭洰锛�</view>
 					<view class="text">{{item.ManagementName}}</view>
-					<view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>闂鎻忚堪锛�</view>
+					<view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>璁㈠崟璇︽儏锛�</view>
 					<view class="text">{{item.Reported_Question}}</view>
 					<!-- <view class="h2txt">闂鍥剧墖锛�</view>	 -->
 						<view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view>
diff --git a/GoldC/pages/problemReport/proRep.js b/GoldC/pages/problemReport/proRep.js
index 9731f0f..da520d5 100644
--- a/GoldC/pages/problemReport/proRep.js
+++ b/GoldC/pages/problemReport/proRep.js
@@ -27,6 +27,7 @@
     erectoList2: [],
     deviceList1: [],
     deviceList2: [],
+    imgUrl: '/images/img.png',
 
     time: '閫夋嫨棰勭害鏃堕棿',
     multiArray: [],//piker鐨刬tem椤�
@@ -45,9 +46,10 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad: function (options) {
-    if (options) {
+
+    if (options && options.info) {
       let info = JSON.parse(options.info)
-      info.state = 3
+      console.log(info);
       this.setData({
         showJD: true,
         paramsInfo: info,
@@ -59,16 +61,200 @@
         erectoList2: [info.erectoName]
       })
       wx.setNavigationBarTitle({
-        title:this.data.form.device.deviceName
+        title: this.data.form.device.deviceName
       })
-      console.log(this.data);
     } else {
       this.getErectoList()
       this.getDeviceList()
     }
+  },
+  changeUserName(e) {
+    this.data.form.userName = e.detail.value
+  },
+  changePhone(e) {
+    this.data.form.userPhone = e.detail.value
+  },
+  changeaddress(e) {
+    this.data.form.address = e.detail.value
+  },
+  changeRemark(e) {
+    this.data.form.remark = e.detail.value
+  },
+  Cancel() {
+    wx.navigateBack()
+  },
+  Yes() {
+    console.log(this.data.form);
+    if (this.data.form.state == 3) {
+      if (!this.data.form.imgUrl) {
+        wx.showToast({
+          title: '璇蜂笂浼犲浘鐗�',
+          icon: 'none'
+        });
+        return
+      }
+      this.data.form.orderType='1'
+      console.log(this.data.form);
+      wx.request({
+        url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder`,
+        method: "put",
+        header: {
+          "Access-Control-Allow-Headers": 'token',
+          Authorization: `Bearer ${wx.getStorageSync('token')}`
+        },
+        data: this.data.form,
+        success: (res, header) => {
+          if (res.data.code != 200) {
+            wx.showToast({
+              title: res.data.msg,
+              icon: 'none'
+            });
+          } else {
+            wx.navigateBack()
+          }
+        }
+      })
+    } else if (Object.keys(this.data.paramsInfo).length > 0 && this.data.form.state != 3) {
+      console.log(this.data.form);
+      let phoneReg = /^1[3456789]\d{9}$/;
+      if (!this.data.form.userName) {
+        wx.showToast({
+          title: '璇疯緭鍏ョ敤鎴峰悕',
+          icon: 'none'
+        })
+        return
+      } else if (!phoneReg.test(this.data.form.userPhone)) {
+        wx.showToast({
+          title: '璇疯緭鍏ユ纭墜鏈哄彿',
+          icon: 'none'
+        })
+        return
+      } else if (!this.data.form.address) {
+        wx.showToast({
+          title: '璇疯緭鍏ュ畨瑁呭湴鍧�',
+          icon: 'none'
+        })
+        return
+      }
+      wx.request({
+        url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder`,
+        method: "put",
+        header: {
+          "Access-Control-Allow-Headers": 'token',
+          Authorization: `Bearer ${wx.getStorageSync('token')}`
+        },
+        data: this.data.form,
+        success: (res, header) => {
+          if (res.data.code != 200) {
+            wx.showToast({
+              title: res.data.msg,
+              icon: 'none'
+            });
+          } else {
+            wx.navigateBack()
+          }
+        }
+      })
+    } else {
+      console.log(this.data.form);
+      let phoneReg = /^1[3456789]\d{9}$/;
+      if (!this.data.form.userName) {
+        wx.showToast({
+          title: '璇疯緭鍏ョ敤鎴峰悕',
+          icon: 'none'
+        })
+        return
+      } else if (!phoneReg.test(this.data.form.userPhone)) {
+        wx.showToast({
+          title: '璇疯緭鍏ユ纭墜鏈哄彿',
+          icon: 'none'
+        })
+        return
+      } else if (!this.data.form.address) {
+        wx.showToast({
+          title: '璇疯緭鍏ュ畨瑁呭湴鍧�',
+          icon: 'none'
+        })
+        return
+      }
+      wx.request({
+        url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder`,
+        method: "post",
+        header: {
+          "Access-Control-Allow-Headers": 'token',
+          Authorization: `Bearer ${wx.getStorageSync('token')}`
+        },
+        data: this.data.form,
+        success: (res, header) => {
+          console.log(res);
+          if (res.data.code != 200) {
+            wx.showToast({
+              title: res.data.msg,
+              icon: 'none'
+            });
+          } else {
+            wx.navigateTo({
+              url: '/pages/problemList/problemList',
+            })
+          }
+        }
+      })
+    }
+  },
+  chooseimage() {
+    var that = this; // 灏嗗綋鍓嶉〉闈㈢殑涓婁笅鏂囪祴鍊肩粰 that 鍙橀噺
+    // 鍦ㄦ煇涓簨浠跺鐞嗗嚱鏁颁腑璋冪敤浠ヤ笅浠ｇ爜
+    wx.chooseImage({
+      count: 1, // 鏈�澶氬彲浠ラ�夋嫨鐨勫浘鐗囨暟閲忥紝杩欓噷璁句负1
+      sourceType: ['album'], // 浠庣浉鍐岄�夋嫨
+      success: function (res) {
+        // 閫夋嫨鎴愬姛鍚庯紝res.tempFilePaths 鏄�夊畾鐨勫浘鐗囩殑鏈湴鏂囦欢璺緞鍒楄〃
+        const tempFilePath = res.tempFilePaths;
+        wx.compressImage({
+          src: tempFilePath[0],
+          quality: 80, // 璁剧疆鍘嬬缉璐ㄩ噺锛岃寖鍥翠负 0-100
+          success: function (res) {
+            const compressedFilePath = res.tempFilePath;
+            console.log(compressedFilePath, 'compressedFilePath');
+            // 鍘嬬缉鍚庣殑鍥剧墖璺緞杩涜鐨勫悗缁搷浣�
+            try {
+              let data = compressedFilePath
+              wx.uploadFile({
+                // 涓婁紶鎺ュ彛璺緞
+                url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder/profile/avatar`,
+                filePath: data,
+                name: 'avatarfile', // 涓婁紶鏂囦欢瀵瑰簲鐨� key 鍚嶇О
+                method: 'post',
+                header: {
+                  'content-type': 'application/form-data',
+                  "Access-Control-Allow-Headers": 'token',
+                  Authorization: `Bearer ${wx.getStorageSync('token')}`
+                },
+                // data: data
+                success: function (res) {
+                  console.log(res.data);
+                  // 涓婁紶鎴愬姛鍚庣殑澶勭悊閫昏緫
+                  that.setData({
+                    imgUrl: 'https://puyue.yhupai.com/prod-api' + JSON.parse(res.data).imgUrl // 灏嗛�夋嫨鐨勫浘鐗囪矾寰勮缃负椤甸潰鏁版嵁鐨勬煇涓睘鎬�
+                  });
+                  console.log(that.data.imgUrl);
+                  that.data.form.imgUrl = that.data.imgUrl
+                },
+                fail: function (res) {
+                  // 涓婁紶澶辫触鍚庣殑澶勭悊閫昏緫
+                  console.log(res, '涓婁紶澶辫触鍚庣殑澶勭悊閫昏緫');
+                }
+              })
+            } catch (e) { }
 
-
-
+          },
+          fail: function (err) {
+            // 鍘嬬缉澶辫触鐨勫鐞�
+            console.error(err);
+          }
+        });
+      }
+    });
   },
   getDeviceList() {
     let data = {
@@ -97,6 +283,8 @@
             deviceList1: res.data.rows,
             deviceList2: data
           })
+          this.data.form.deviceId = res.data.rows[0].deviceId
+          this.data.form.deviceName = res.data.rows[0].deviceName
         }
       }
     })
@@ -117,7 +305,6 @@
       },
       params: data,
       success: (res, header) => {
-
         if (res.data.code != 200) {
           wx.showToast({
             title: res.data.msg,
@@ -136,21 +323,47 @@
             erectoList2: data
           })
 
+          this.data.form.erectoId = -1
+          this.data.form.erectoName = '鏈寚娲�'
         }
       }
     })
   },
   bindPicker(e) {
-    // console.log('picker鍙戦�侀�夋嫨鏀瑰彉锛屾惡甯﹀�间负', e.detail.value)
+    console.log('picker鍙戦�侀�夋嫨鏀瑰彉锛屾惡甯﹀�间负', e.detail.value)
     this.setData({
       deviceIndex: e.detail.value
     })
+    this.data.form.deviceId = this.data.deviceList1[e.detail.value].deviceId
+    this.data.form.deviceName = this.data.deviceList1[e.detail.value].deviceName
+    console.log(this.data.form, this.data.deviceList1);
   },
   bindPicker2(e) {
-    // console.log('picker鍙戦�侀�夋嫨鏀瑰彉锛屾惡甯﹀�间负', e.detail.value)
     this.setData({
       erectoIndex: e.detail.value
     })
+    if (this.data.erectoIndex == 0) {
+      let item = JSON.parse(JSON.stringify(this.data.form))
+      item.state = 0
+      this.setData({
+        form: item
+      })
+      // this.data.form.state = 0
+      this.data.form.erectoId = -1
+      this.data.form.erectoName = '鏈寚娲�'
+    } else {
+      let item = JSON.parse(JSON.stringify(this.data.form))
+      item.state = 1
+      this.setData({
+        form: item
+      })
+      // this.data.form.state = 1
+      this.data.form.erectoId = this.data.erectoList1[Number(e.detail.value)].userId
+      this.data.form.erectoName = this.data.erectoList1[Number(e.detail.value)].nickName
+    }
+    console.log(this.data.erectoList1, this.data.erectoList2, e.detail.value, this.data.form);
+
+
   },
   openShowDate() {
     this.setData({
@@ -178,7 +391,7 @@
       hour: hour, //璁板綍閫夋嫨鐨勬椂
       minute: minute, //璁板綍閫夋嫨鐨勫垎 
     })
-    console.log(this.data.time);
+    this.data.form.appointmentTime = this.data.time
   },
   bindMultiPickerColumnChange: function (e) { //鐩戝惉picker鐨勬粴鍔ㄤ簨浠�
 
@@ -369,7 +582,28 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
   onShow: function () {
-    if (!this.data.showJD) {
+
+    if (this.data.form && this.data.form.appointmentTime) {
+      var loadPickerData = DatePickerUtil.loadPickerData()
+      // var getCurrentDate = DatePickerUtil.getCurrentDate()
+      var GetMultiIndex = DatePickerUtil.GetMultiIndex()
+      //杩欓噷鍐欑殑鏄负浜嗚褰曞綋鍓嶆椂闂�
+      let year = parseInt(this.data.form.appointmentTime.substring(0, 4));
+      let month = parseInt(this.data.form.appointmentTime.substring(5, 7));
+      let day = parseInt(this.data.form.appointmentTime.substring(8, 10));
+      let hour = parseInt(this.data.form.appointmentTime.substring(11, 13));
+      let minute = parseInt(this.data.form.appointmentTime.substring(14, 16));
+      this.setData({
+        multiArray: loadPickerData,//picker鏁扮粍璧嬪�硷紝鏍煎紡 [years, months, days, hours, minutes]
+        multiIndex: GetMultiIndex,//璁剧疆pickerIndex锛孾0,0,0,0,0]
+        time: year + '-' + month + '-' + day + ' ' + hour + '-' + minute, //璁剧疆褰撳墠鏃堕棿 锛宑urrentYears+'-'+mm+'-'+dd+' '+hh+':'+min
+        year: year,//璁板綍閫夋嫨鐨勫勾
+        month: month,//璁板綍閫夋嫨鐨勬湀
+        day: day,//璁板綍閫夋嫨鐨勬棩
+        hour: hour,//璁板綍閫夋嫨鐨勬椂
+        minute: minute,//璁板綍閫夋嫨鐨勫垎 
+      });
+    } else {
       var loadPickerData = DatePickerUtil.loadPickerData()
       var getCurrentDate = DatePickerUtil.getCurrentDate()
       var GetMultiIndex = DatePickerUtil.GetMultiIndex()
diff --git a/GoldC/pages/problemReport/proRep.wxml b/GoldC/pages/problemReport/proRep.wxml
index 674b5e0..bdc5137 100644
--- a/GoldC/pages/problemReport/proRep.wxml
+++ b/GoldC/pages/problemReport/proRep.wxml
@@ -6,7 +6,7 @@
     <image class="primg" src="/images/ProRep/pingding.png"></image>
     <view>璁惧</view>
   </view>
-  <picker bindchange="bindPicker" value="{{deviceIndex}}" range="{{deviceList2}}" disabled='{{showJD}}'>
+  <picker bindchange="bindPicker" value="{{deviceIndex}}" range="{{deviceList2}}" disabled='{{showJD&&form.state>0}}'>
     <view class="chose">{{deviceList2[deviceIndex]?deviceList2[deviceIndex]:'璇烽�夋嫨璁惧'}}</view>
   </picker>
 </view>
@@ -17,7 +17,7 @@
     <image class="primg" src="/images/ProRep/name.png"></image>
     <view>瀹夎宸�</view>
   </view>
-  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled='{{showJD}}'>
+  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled='{{showJD&&form.state>0}}'>
     <view class="chose">{{erectoList2[erectoIndex]?erectoList2[erectoIndex]:'璇烽�夋嫨瀹夎宸�'}}</view>
   </picker>
 </view>
@@ -27,20 +27,20 @@
     <image class="primg" src="/images/ProRep/gongsixiangmu.png"></image>
     <view>鐘舵��</view>
   </view>
-  <!-- <radio-group bindchange="radioChange"> -->
+  <radio-group bindchange="radioChange">
     <label>
-      <radio value="0" checked="{{form.state==0}}" disabled='{{showJD}}'>鏈寚娲�</radio>
+      <radio value="0" checked="{{form.state==0}}" disabled='{{true}}'>鏈寚娲�</radio>
     </label>
     <label>
-      <radio value="1" checked="{{form.state==1}}" disabled='{{showJD}}'>宸叉淳鍗�</radio>
+      <radio value="1" checked="{{form.state==1}}" disabled='{{true}}'>宸叉淳鍗�</radio>
     </label>
     <label>
-      <radio value="2" checked="{{form.state==2}}" disabled='{{showJD}}'>宸叉帴鍗�</radio>
+      <radio value="2" checked="{{form.state==2}}" disabled='{{true}}'>宸叉帴鍗�</radio>
     </label>
     <label>
-      <radio value="3" checked="{{form.state==3}}" disabled='{{showJD}}'>宸插畬鎴�</radio>
+      <radio value="3" checked="{{form.state==3}}" disabled='{{true}}'>宸插畬鎴�</radio>
     </label>
-  <!-- </radio-group> -->
+  </radio-group>
   <!-- <van-radio-group value="{{ from.state }}"  direction="horizontal">
     <van-radio name="0">鏈寚娲�</van-radio>
     <van-radio name="1">宸叉淳鍗�</van-radio>
@@ -54,21 +54,21 @@
     <image class="primg" src="/images/ProRep/uptext.png"></image>
     <view>鐢ㄦ埛濮撳悕</view>
   </view>
-  <input bindinput="shangbao" value="{{form.userName}}" class="textbox" placeholder="璇疯緭鍏ョ敤鎴峰鍚�"></input>
+  <input bindinput="changeUserName" value="{{form.userName}}" class="textbox" placeholder="璇疯緭鍏ョ敤鎴峰鍚�"></input>
 </view>
 <view>
   <view class="title">
     <image class="primg" src="/images/ProRep/uptext.png"></image>
     <view>鎵嬫満鍙�</view>
   </view>
-  <input bindinput="shangbao" value="{{form.userPhone}}" class="textbox" placeholder="璇疯緭鍏ユ墜鏈哄彿"></input>
+  <input bindinput="changePhone" value="{{form.userPhone}}" class="textbox" placeholder="璇疯緭鍏ユ墜鏈哄彿"></input>
 </view>
 <view>
   <view class="title">
     <image class="primg" src="/images/ProRep/uptext.png"></image>
     <view>瀹夎鍦板潃</view>
   </view>
-  <input bindinput="shangbao" value="{{form.address}}" class="textbox" placeholder="璇疯緭鍏ュ畨瑁呭湴鍧�"></input>
+  <input bindinput="changeaddress" value="{{form.address}}" class="textbox" placeholder="璇疯緭鍏ュ畨瑁呭湴鍧�"></input>
 </view>
 
 <view>
@@ -88,25 +88,25 @@
     <image class="primg" src="/images/ProRep/uptext.png"></image>
     <view>澶囨敞</view>
   </view>
-  <textarea bindinput="shangbao" class="textbox" value="{{form.remark}}" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�..."></textarea>
+  <textarea bindinput="changeRemark" class="textbox" value="{{form.remark}}" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�..."></textarea>
 </view>
 
 
 
 <!-- 涓婁紶鍥剧墖 -->
-<view>
+<view wx:if="{{form&&form.state==3 }}">
   <view class="title">
     <image class="primg" src="/images/ProRep/imgicon.png"></image>
     <view>涓婁紶鐓х墖</view>
   </view>
   <view class="photoBox">
-		<view wx:for="{{imageUrl}}" style="display:inline" class="upimgbox"> 
-			<image class="upphotoimg" src="{{item}}" mode="aspectFill" style="margin-right:15rpx"></image>
-			<image class="removeimg" src="/images/del.png" bindtap="removeimg" data-index="{{index}}"></image>
-		</view>
-		<image wx:if="{{imageUrl.length<2}}" class="upphotoimg" src="/images/img.png" mode="aspectFill" bindtap="chooseImage"></image>
-		<view>灏哄鍦�512*512浠ュ唴锛屽ぇ灏忓湪500kb浠ュ唴</view>
-	</view>
+    <view wx:for="{{imageUrl}}" style="display:inline" class="upimgbox">
+      <image class="upphotoimg" src="{{item}}" mode="aspectFill" style="margin-right:15rpx"></image>
+      <image class="removeimg" src="/images/del.png" bindtap="removeimg" data-index="{{index}}"></image>
+    </view>
+    <image wx:if="{{imageUrl.length<2}}" class="upphotoimg" src="{{imgUrl}}" mode="aspectFill" bindtap="chooseimage"></image>
+    <!-- <view>灏哄鍦�512*512浠ュ唴锛屽ぇ灏忓湪500kb浠ュ唴</view> -->
+  </view>
 </view>
 
 <!-- <view class="addressBtn" bindtap="openBaiduMap">鎵撳紑鐧惧害鍦板浘</view> -->
diff --git a/GoldC/pages/xiangqing/xiangqing.wxml b/GoldC/pages/xiangqing/xiangqing.wxml
index d982f0b..a624c23 100644
--- a/GoldC/pages/xiangqing/xiangqing.wxml
+++ b/GoldC/pages/xiangqing/xiangqing.wxml
@@ -7,7 +7,7 @@
 					<view class="text">{{listdata.ManagementName}}</view>
 					<view class="title">
 					<image class="primg" src="/images/ProRep/uptext.png"></image>
-					闂鎻忚堪锛�</view>
+					璁㈠崟璇︽儏锛�</view>
 					<view class="text">{{listdata.Reported_Question}}</view>
 					<!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">鏌ョ湅璇︽儏></view> -->
 					<!-- <view class="title">闂鐐圭幇鍦哄浘鐗囷細</view> -->
diff --git a/GoldC/project.config.json b/GoldC/project.config.json
index 85f980a..0ac13ff 100644
--- a/GoldC/project.config.json
+++ b/GoldC/project.config.json
@@ -1,9 +1,5 @@
 {
   "description": "椤圭洰閰嶇疆鏂囦欢",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
   "setting": {
     "urlCheck": false,
     "es6": true,
@@ -24,8 +20,6 @@
     "compileHotReLoad": false,
     "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
@@ -44,14 +38,16 @@
     "condition": false
   },
   "compileType": "miniprogram",
-  "libVersion": "2.12.0",
-  "appid": "wxbe7578f86ae97314",
-  "projectname": "water",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
   "condition": {},
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2
-  }
+  },
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wxbe7578f86ae97314"
 }
\ No newline at end of file

--
Gitblit v1.8.0