From 1a0abf4788e8b1ee17d5a3a9834385bbc6b8f14b Mon Sep 17 00:00:00 2001
From: hailu <962012470@qq.com>
Date: 星期四, 07 十二月 2023 17:38:53 +0800
Subject: [PATCH] 备份

---
 GoldC/pages/problemReport/proRep.json        |    1 
 GoldC/pages/yetAZ/components/datePicker.js   |  174 ++++
 GoldC/pages/login/login.js                   |    1 
 GoldC/pages/yetWX/yetWX.json                 |    6 
 GoldC/pages/prorepwx/prorepwx.wxss           |    8 
 GoldC/pages/yetWX/components/datePicker.wxml |    8 
 GoldC/pages/problemList/problemList.js       |   86 +
 GoldC/pages/prorepwx/prorepwx.wxml           |   34 
 GoldC/pages/yetWX/components/datePicker.wxss |    1 
 GoldC/pages/home/home.js                     |    2 
 GoldC/pages/yetAZ/yetAZ.json                 |    7 
 GoldC/pages/yetWX/components/datePicker.js   |  174 ++++
 GoldC/pages/problemListwx/problemListwx.js   |   71 +
 GoldC/pages/yetAZ/components/datePicker.wxml |    8 
 GoldC/pages/yetAZ/components/datePicker.wxss |    1 
 GoldC/pages/prorepwx/prorepwx.js             |   56 
 GoldC/pages/problemListwx/problemListwx.wxss |    3 
 GoldC/pages/problemListwx/problemListwx.wxml |   48 
 GoldC/pages/problemList/problemList.wxml     |   24 
 GoldC/pages/yetAZ/yetAZ.wxml                 |  115 ++
 GoldC/pages/problemList/problemList.wxss     |    4 
 GoldC/pages/yetAZ/yetAZ.wxss                 |  119 +++
 GoldC/pages/yetWX/yetWX.js                   |  487 ++++++++++++
 GoldC/app.json                               |    4 
 GoldC/pages/problemReport/proRep.js          |   70 +
 GoldC/pages/yetWX/components/datePicker.json |    6 
 GoldC/pages/prorepwx/prorepwx.json           |    2 
 GoldC/pages/problemReport/proRep.wxss        |    9 
 GoldC/pages/yetWX/yetWX.wxss                 |  118 +++
 GoldC/pages/yetWX/yetWX.wxml                 |  126 +++
 GoldC/pages/problemReport/proRep.wxml        |   35 
 GoldC/pages/yetAZ/yetAZ.js                   |  494 ++++++++++++
 GoldC/pages/yetAZ/components/datePicker.json |    6 
 33 files changed, 2,163 insertions(+), 145 deletions(-)

diff --git a/GoldC/app.json b/GoldC/app.json
index a309a57..ee5f49b 100644
--- a/GoldC/app.json
+++ b/GoldC/app.json
@@ -18,7 +18,9 @@
     "pages/maintenance/maintenance",
     "pages/devicelogs/devicelogs",
     "pages/prorepwx/prorepwx",
-    "pages/problemListwx/problemListwx"
+    "pages/problemListwx/problemListwx",
+    "pages/yetAZ/yetAZ",
+    "pages/yetWX/yetWX"
   ],
   "permission": {
     "scope.userLocation": {
diff --git a/GoldC/pages/home/home.js b/GoldC/pages/home/home.js
index 98ebcbb..fb46bcc 100644
--- a/GoldC/pages/home/home.js
+++ b/GoldC/pages/home/home.js
@@ -116,7 +116,7 @@
           })
           wx.setStorageSync('deptId', res.data.user.dept.deptId)
           wx.setStorageSync('erectoId', res.data.user.userId)
-          // console.log(wx.getStorageInfoSync('erectoId'));
+
         }
       }
     })
diff --git a/GoldC/pages/login/login.js b/GoldC/pages/login/login.js
index 39219d6..5084a44 100644
--- a/GoldC/pages/login/login.js
+++ b/GoldC/pages/login/login.js
@@ -62,6 +62,7 @@
           title: res.data.msg,
           icon: "none"
         })
+        this.getImg()
       } else {
         wx.setStorageSync('token', res.data.token)
         wx.showToast({
diff --git a/GoldC/pages/problemList/problemList.js b/GoldC/pages/problemList/problemList.js
index 6178d91..71df3db 100644
--- a/GoldC/pages/problemList/problemList.js
+++ b/GoldC/pages/problemList/problemList.js
@@ -47,7 +47,7 @@
     info2: 0,
     info3: 0,
     info4: 0,
-
+    topNum:0,
   },
   lifetimes: {
     // 鍦ㄧ粍浠跺疄渚嬭繘鍏ラ〉闈㈣妭鐐规爲鏃舵墽琛�
@@ -73,6 +73,12 @@
   onLoad: function (options) {
 
 
+  },
+  goTop () {  // 涓�閿洖鍒伴《閮�
+    wx.pageScrollTo({
+      scrollTop: 0,
+      duration: 300
+    });
   },
   // 璁剧疆寮傛璇锋眰涔嬪悗鐨勯〉闈€�佹�昏褰曟暟
   setPage(index, total) {
@@ -110,31 +116,61 @@
   },
   //鏇存敼椤电爜鐐瑰嚮浜嬩欢
   onChangePage: function (e) {
-    //console.log("鏇存敼椤电爜浜嬩欢锛�",e);
+    console.log("鏇存敼椤电爜浜嬩欢锛�",e);
     this.setData({
       pageMask: false,
       index: e.currentTarget.dataset.index //鐐瑰嚮鐨勯〉鏁�
     })
     this.getList()
     // 鍏堝垽鏂綋鍓嶉〉鏁帮紝鏄惁闇�瑕佹洿鏂癲isabled鐨勭姸鎬�
-    this.updateBtnDis();
     this.triggerParent();
+    if (e.currentTarget.dataset.index <= 1) {
+      this.setData({
+        prevBtnDis: false,
+      })
+    }
+    
   },
   //涓婁竴椤电偣鍑讳簨浠�
   prevPage: function () {
-    if (this.data.index <= 1) return;
+    console.log(this.data.index,this.data.total);
+    if (this.data.index <= 1) {
+      this.setData({
+        prevBtnDis: false,
+      })
+      return false
+    }
+    if (this.data.index <= this.data.total) {
+      this.setData({
+        nextBtnDis: false,
+      })
+    }
     let num = this.data.index - 1;
     this.setData({
-      index: num
+      index: num,
+      prevBtnDis:true
     })
     this.getList()
     this.triggerParent();
-    鏇存柊鎸夐挳鐘舵��
-    this.updateBtnDis();
   },
   //涓嬩竴椤电偣鍑讳簨浠�
   nextPage: function () {
-    if (this.data.index >= this.data.total) return;
+    console.log(this.data.index,this.data.total);
+
+    if (this.data.index >= this.data.total) {
+      this.setData({
+        nextBtnDis: false,
+      })
+      return false
+    }
+    this.setData({
+      nextBtnDis: true,
+    })
+    if (this.data.index >= 1) {
+      this.setData({
+        prevBtnDis: false
+      })
+    }
     let num = this.data.index + 1;
     this.setData({
       index: num
@@ -143,14 +179,14 @@
     this.triggerParent();
 
     // 鏇存柊鎸夐挳鐘舵��
-    this.updateBtnDis();
   },
   changeActive1(e) {
     console.log(e.detail.index);
     this.setData({
       state: e.detail.index,
       active1: e.detail.index,
-      nickName: wx.getStorageSync('nickName')
+      nickName: wx.getStorageSync('nickName'),
+      index:1
     })
     this.getList()
   },
@@ -158,7 +194,8 @@
     console.log(e.detail.index, this.data.erectoListLevel)
     this.setData({
       active2: e.detail.index,
-      nextlevel: this.data.erectoListLevel[0].userId
+      nextlevel: this.data.erectoListLevel[0].userId,
+      index:1
     })
     this.getNumInfo()
     this.getList()
@@ -167,7 +204,8 @@
     console.log(e.detail.index);
     this.setData({
       active3: e.detail.index,
-      nextlevel: this.data.erectoListLevel[e.detail.index].userId
+      nextlevel: this.data.erectoListLevel[e.detail.index].userId,
+      index:1
     })
     this.getNumInfo()
     this.getList()
@@ -183,7 +221,7 @@
     var roleKey = wx.getStorageSync('roleKey')
     let data = {
       pageNum: this.data.index,
-      pageSize: 10,
+      pageSize: 5,
       state: this.data.state,
       orderType: 1,
     }
@@ -212,25 +250,26 @@
       data: data,
       success: (res, header) => {
         if (res.data.code == 200 && res.data.rows.length > 0) {
-
           let data = res.data
-          let total = Math.ceil(res.data.total / 10)
+          let total = Math.ceil(res.data.total / 5)
           this.setData({
             listdata: data.rows,
             total: total,
             showPage: true,
             showNull: false
           })
-          console.log(this.data.listdata)
+          this.goTop()
           wx.hideLoading()
-
         } else {
           this.setData({
             listdata: [],
             total: 0,
             showPage: false,
-            showNull: true
+            showNull: true,
+            prevBtnDis:true,
+            nextBtnDis:true,
           })
+          this.goTop()
           wx.hideLoading()
         }
       }
@@ -245,6 +284,7 @@
       pageSize: 10000,
       deptId: wx.getStorageSync('deptId'),
       roleKey: 'tenanthelper',
+      isAuthentication: 1
     }
     console.log(data);
     wx.request({
@@ -371,6 +411,12 @@
       url: '/pages/problemReport/proRep?info=' + JSON.stringify(item),
     })
   },
+  yetstatements(e) {
+    let item = JSON.parse(JSON.stringify(e.currentTarget.dataset.base))
+    wx.navigateTo({
+      url: '/pages/yetAZ/yetAZ?info=' + JSON.stringify(item),
+    })
+  },
   goAddress(e) {
     var address = e.currentTarget.dataset.base.address
     console.log(e.currentTarget.dataset);
@@ -448,6 +494,7 @@
             index: 1,
             modalHidden: true
           })
+          this.getNumInfo()
           this.getList()
         } else {
           this.setData({
@@ -475,7 +522,7 @@
   },
   DelChange() {
     wx.request({
-      url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder/${this.data.form.id}`,
+      url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder/${this.data.form.id}/${this.data.form.deviceId}`,
       method: "DELETE",
       header: {
         "Access-Control-Allow-Headers": 'token',
@@ -487,6 +534,7 @@
             index: 1,
             delModal: true
           })
+          this.getNumInfo()
           this.getList()
         } else {
           this.setData({
diff --git a/GoldC/pages/problemList/problemList.wxml b/GoldC/pages/problemList/problemList.wxml
index 329d24f..946c6be 100644
--- a/GoldC/pages/problemList/problemList.wxml
+++ b/GoldC/pages/problemList/problemList.wxml
@@ -16,7 +16,7 @@
     <view class="listBox">
       <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
         <view class="heard">
-          <view class="htext">{{item.device.deviceName}}</view>
+          <view class="htext">ID{{item.id}} | {{ item.device.deviceName}}</view>
         </view>
         <view class="body">
           <view class="h2txt">
@@ -29,7 +29,7 @@
             棰勭害鏃堕棿锛�<text>{{item.appointmentTime?item.appointmentTime:'--'}}</text>
           </view>
           <view class="text" data-base='{{item}}' bind:tap="goAddress">
-            瀹夎鍦扮偣锛�<text>{{item.address}}</text>
+            瀹夎鍦板潃锛�<text>{{item.address}}</text>
             <image class="timeicon" src="/images/ProRep/weizhi.png" style="margin-left: 10rpx;" mode="" />
           </view>
           <view class="text">
@@ -64,7 +64,7 @@
     <view class="listBox">
       <view class="list" wx:for="{{listdata}}" wx:for-item="item">
         <view class="heard">
-          <view class="htext">{{item.device.deviceName}}</view>
+          <view class="htext">ID{{item.id}} | {{ item.device.deviceName}}</view>
         </view>
         <view class="body">
           <view class="h2txt">
@@ -80,7 +80,7 @@
             棰勭害鏃堕棿锛�<text>{{item.appointmentTime?item.appointmentTime:'--'}}</text>
           </view>
           <view class="text" data-base='{{item}}' bind:tap="goAddress">
-            瀹夎鍦扮偣锛�<text>{{item.address}}</text>
+            瀹夎鍦板潃锛�<text>{{item.address}}</text>
             <image class="timeicon" src="/images/ProRep/weizhi.png" style="margin-left: 10rpx;" mode="" />
           </view>
           <view class="text">
@@ -114,7 +114,7 @@
     <view class="listBox">
       <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
         <view class="heard">
-          <view class="htext">{{item.device.deviceName}}</view>
+          <view class="htext">ID{{item.id}} | {{ item.device.deviceName}}</view>
         </view>
         <view class="body">
           <view class="h2txt">
@@ -130,7 +130,7 @@
             棰勭害鏃堕棿锛�<text>{{item.appointmentTime?item.appointmentTime:'--'}}</text>
           </view>
           <view class="text" data-base='{{item}}' bind:tap="goAddress">
-            瀹夎鍦扮偣锛�<text>{{item.address}}</text>
+            瀹夎鍦板潃锛�<text>{{item.address}}</text>
             <image class="timeicon" src="/images/ProRep/weizhi.png" style="margin-left: 10rpx;" mode="" />
           </view>
           <view class="text">
@@ -158,7 +158,7 @@
     <view class="listBox">
       <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
         <view class="heard">
-          <view class="htext">{{item.device.deviceName}}</view>
+          <view class="htext">ID{{item.id}} | {{ item.device.deviceName}}</view>
         </view>
         <view class="body">
           <view class="h2txt">
@@ -177,7 +177,7 @@
             棰勭害鏃堕棿锛�<text>{{item.appointmentTime?item.appointmentTime:'--'}}</text>
           </view>
           <view class="text" data-base='{{item}}' bind:tap="goAddress">
-            瀹夎鍦扮偣锛�<text>{{item.address}}</text>
+            瀹夎鍦板潃锛�<text>{{item.address}}</text>
             <image class="timeicon" src="/images/ProRep/weizhi.png" style="margin-left: 10rpx;" mode="" />
           </view>
           <view class="text">
@@ -191,7 +191,7 @@
         <view class="footer">
           <view class="libtn">
             <!-- 淇敼 -->
-            <view class="btn btn-jd" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="statements">
+            <view class="btn btn-ck" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="yetstatements">
 
               <van-icon name="browsing-history-o" class="icon" />
               <text>鏌ョ湅</text>
@@ -210,9 +210,11 @@
 
 <view class="page-control" wx:if="{{showPage}}">
   <view class="page-control-btns">
-    <view class="page-btn {{prevBtnDis?'btn-disabled':''}}" bindtap="prevPage">涓婁竴椤�</view>
+    <!-- class="page-btn {{prevBtnDis?'btn-disabled':''}}" -->
+    <button class="page-btn {{total<=1||index==1?'btn-disabled':''}}"  disabled="{{total<=1||index==1}}" bindtap="prevPage">涓婁竴椤�</button>
     <view class="page-number" bindtap="shopPagePopup"><text>{{index}}</text>/<text>{{total}}</text></view>
-    <view class="page-btn {{nextBtnDis?'btn-disabled':''}}" bindtap="nextPage">涓嬩竴椤�</view>
+    <button class="page-btn {{total<=1||index==total?'btn-disabled':''}}" disabled="{{total<=1||index==total}}" bindtap="nextPage">涓嬩竴椤�</button>
+    <!-- class="page-btn {{nextBtnDis?'btn-disabled':''}}" -->
   </view>
   <view class="page-container" hidden="{{!pageMask}}">
     <view class="page-mask" bindtap="hidePagePopup"></view>
diff --git a/GoldC/pages/problemList/problemList.wxss b/GoldC/pages/problemList/problemList.wxss
index 8ad7c8f..8b3a025 100644
--- a/GoldC/pages/problemList/problemList.wxss
+++ b/GoldC/pages/problemList/problemList.wxss
@@ -121,7 +121,9 @@
   justify-content: center;
   align-items: center;
 }
-
+.btn-ck{
+  background-color: #FF8C00;
+}
 .icon {
   position: relative;
   top: 4rpx;
diff --git a/GoldC/pages/problemListwx/problemListwx.js b/GoldC/pages/problemListwx/problemListwx.js
index 749240b..51bd5a2 100644
--- a/GoldC/pages/problemListwx/problemListwx.js
+++ b/GoldC/pages/problemListwx/problemListwx.js
@@ -59,20 +59,18 @@
     }
   },
 
-  // 璇︽儏灞曠ず
-  toxiangqin(e) {
-    console.log(e.target.dataset.id)
-    var id = e.target.dataset.id
-    wx.navigateTo({
-      url: '/pages/xiangqing/xiangqing?id=' + id,
-    })
-  },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad: function (options) {
 
 
+  },
+  goTop() {  // 涓�閿洖鍒伴《閮�
+    wx.pageScrollTo({
+      scrollTop: 0,
+      duration: 300
+    });
   },
   // 璁剧疆寮傛璇锋眰涔嬪悗鐨勯〉闈€�佹�昏褰曟暟
   setPage(index, total) {
@@ -84,14 +82,11 @@
 
   //姣忔鏀瑰彉椤电爜灏辫皟鐢ㄨ鍑芥暟
   triggerParent: function () {
-
     // 閫氱煡鐖剁粍浠跺綋鍓嶅姞杞界殑椤垫暟
-
     // 鑷畾涔夌粍浠跺悜鐖剁粍浠朵紶鍊� 
     const option = {
       currentIndex: this.data.index
     };
-
     // pagingChange 鑷畾涔夊悕绉颁簨浠讹紝鐖剁粍浠朵腑浣跨敤
     this.triggerEvent('pagingChange', option)
 
@@ -111,30 +106,54 @@
   //鏇存敼椤电爜鐐瑰嚮浜嬩欢
   onChangePage: function (e) {
     //console.log("鏇存敼椤电爜浜嬩欢锛�",e);
+   
     this.setData({
       pageMask: false,
       index: e.currentTarget.dataset.index //鐐瑰嚮鐨勯〉鏁�
     })
     this.getList()
     // 鍏堝垽鏂綋鍓嶉〉鏁帮紝鏄惁闇�瑕佹洿鏂癲isabled鐨勭姸鎬�
-    this.updateBtnDis();
+   
     this.triggerParent();
   },
   //涓婁竴椤电偣鍑讳簨浠�
   prevPage: function () {
-    if (this.data.index <= 1) return;
+
+   if (this.data.index <= 1) {
+      this.setData({
+        prevBtnDis: false,
+      })
+      return false
+    }
+    if (this.data.index <= this.data.total) {
+      this.setData({
+        nextBtnDis: false,
+      })
+    }
     let num = this.data.index - 1;
     this.setData({
       index: num
     })
     this.getList()
     this.triggerParent();
-    鏇存柊鎸夐挳鐘舵��
-    this.updateBtnDis();
+   
   },
   //涓嬩竴椤电偣鍑讳簨浠�
   nextPage: function () {
-    if (this.data.index >= this.data.total) return;
+    if (this.data.index >= this.data.total) {
+      this.setData({
+        nextBtnDis: false,
+      })
+      return false
+    }
+    this.setData({
+      nextBtnDis: true,
+    })
+    if (this.data.index >= 1) {
+      this.setData({
+        prevBtnDis: false
+      })
+    }
     let num = this.data.index + 1;
     this.setData({
       index: num
@@ -143,7 +162,7 @@
     this.triggerParent();
 
     // 鏇存柊鎸夐挳鐘舵��
-    this.updateBtnDis();
+  
   },
   changeActive1(e) {
     console.log(e.detail.index);
@@ -184,7 +203,7 @@
     var roleKey = wx.getStorageSync('roleKey')
     let data = {
       pageNum: this.data.index,
-      pageSize: 10,
+      pageSize: 5,
       state: this.data.state,
       orderType: '2',
     }
@@ -216,14 +235,14 @@
         if (res.data.code == 200 && res.data.rows.length > 0) {
 
           let data = res.data
-          let total = Math.ceil(res.data.total / 10)
+          let total = Math.ceil(res.data.total / 5)
           this.setData({
             listdata: data.rows,
             total: total,
             showPage: true,
             showNull: false
           })
-          console.log(this.data.listdata)
+          this.goTop()
           wx.hideLoading()
         } else {
           this.setData({
@@ -232,6 +251,7 @@
             showPage: false,
             showNull: true
           })
+          this.goTop()
           wx.hideLoading()
         }
       }
@@ -246,6 +266,7 @@
       pageSize: 10000,
       deptId: wx.getStorageSync('deptId'),
       roleKey: 'tenanthelper',
+      isAuthentication: 1
     }
     console.log(data);
     wx.request({
@@ -368,6 +389,12 @@
       url: '/pages/prorepwx/prorepwx?info=' + JSON.stringify(item),
     })
   },
+  yetstatements(e) {
+    let item = JSON.parse(JSON.stringify(e.currentTarget.dataset.base))
+    wx.navigateTo({
+      url: '/pages/yetWX/yetWX?info=' + JSON.stringify(item),
+    })
+  },
   goAddress(e) {
     var address = e.currentTarget.dataset.base.address
     console.log(e.currentTarget.dataset);
@@ -446,6 +473,7 @@
             index: 1,
             modalHidden: true
           })
+          this.getNumInfo()
           this.getList()
         } else {
           this.setData({
@@ -473,7 +501,7 @@
   },
   DelChange() {
     wx.request({
-      url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder/${this.data.form.id}`,
+      url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder/${this.data.form.id}/${this.data.form.deviceId}`,
       method: "DELETE",
       header: {
         "Access-Control-Allow-Headers": 'token',
@@ -485,6 +513,7 @@
             index: 1,
             delModal: true
           })
+          this.getNumInfo()
           this.getList()
         } else {
           this.setData({
diff --git a/GoldC/pages/problemListwx/problemListwx.wxml b/GoldC/pages/problemListwx/problemListwx.wxml
index 8811348..6eb5a7d 100644
--- a/GoldC/pages/problemListwx/problemListwx.wxml
+++ b/GoldC/pages/problemListwx/problemListwx.wxml
@@ -10,13 +10,13 @@
     </van-tab>
   </van-tabs>
 </view>
-<van-tabs active="{{ active1 }}"  info='2' bind:change="changeActive1">
+<van-tabs active="{{ active1 }}" info='2' bind:change="changeActive1">
   <!-- 宸蹭笂鎶� -->
   <van-tab title="鏈淳鍗�" info="{{info1}}">
     <view class="listBox">
       <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
         <view class="heard">
-          <view class="htext">{{item.device.deviceName}}</view>
+          <view class="htext">ID{{item.id}} | {{ item.device.deviceName}}</view>
         </view>
         <view class="body">
           <view class="h2txt">
@@ -24,16 +24,18 @@
             璁㈠崟璇︽儏锛�
           </view>
           <view class="text">鐢ㄦ埛濮撳悕锛歿{item.userName}}</view>
-          <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}} <van-icon data-base='{{item}}' bind:tap="call" name="phone" style="font-size: 18px;color: #1E90FF;position: relative;top: 3px;" /></view>
+          <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}}
+            <van-icon data-base='{{item}}' bind:tap="call" name="phone" style="font-size: 18px;color: #1E90FF;position: relative;top: 3px;" />
+          </view>
           <view class="text">
             棰勭害鏃堕棿锛�<text>{{item.appointmentTime?item.appointmentTime:'--'}}</text>
           </view>
           <view class="text" data-base='{{item}}' bind:tap="goAddress">
-            缁翠慨鍦扮偣锛�<text>{{item.address}}</text>
+            缁翠慨鍦板潃锛�<text>{{item.address}}</text>
             <image class="timeicon" src="/images/ProRep/weizhi.png" style="margin-left: 10rpx;" mode="" />
           </view>
           <view class="text">
-            璁㈠崟澶囨敞锛�<text>{{item.remark?item.remark:'--'}}</text>
+            鏁呴殰鎻忚堪锛�<text>{{item.remark?item.remark:'--'}}</text>
           </view>
           <view class="time" wx:if='{{item.receiveTime}}'>
             <image class="timeicon" src="/images/time.png"></image>
@@ -43,7 +45,7 @@
         <view class="footer">
           <view class="libtn">
             <!-- 淇敼 -->
-            <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="edit">
+            <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>
@@ -64,7 +66,7 @@
     <view class="listBox">
       <view class="list" wx:for="{{listdata}}" wx:for-item="item">
         <view class="heard">
-          <view class="htext">{{item.device.deviceName}}</view>
+          <view class="htext">ID{{item.id}} | {{ item.device.deviceName}}</view>
         </view>
         <view class="body">
           <view class="h2txt">
@@ -72,7 +74,9 @@
             璁㈠崟璇︽儏锛�
           </view>
           <view class="text">鐢ㄦ埛濮撳悕锛歿{item.userName}}</view>
-          <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}} <van-icon data-base='{{item}}' bind:tap="call" name="phone" style="font-size: 18px;color: #1E90FF;position: relative;top: 3px;" /></view>
+          <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}}
+            <van-icon data-base='{{item}}' bind:tap="call" name="phone" style="font-size: 18px;color: #1E90FF;position: relative;top: 3px;" />
+          </view>
           <view class="text" wx:if="{{roleKey!='tenantservice'}}">
             缁翠慨宸ヤ汉锛�<text>{{item.erectoName?item.erectoName:'--'}}</text>
           </view>
@@ -80,11 +84,11 @@
             棰勭害鏃堕棿锛�<text>{{item.appointmentTime?item.appointmentTime:'--'}}</text>
           </view>
           <view class="text" data-base='{{item}}' bind:tap="goAddress">
-            缁翠慨鍦扮偣锛�<text>{{item.address}}</text>
+            缁翠慨鍦板潃锛�<text>{{item.address}}</text>
             <image class="timeicon" src="/images/ProRep/weizhi.png" style="margin-left: 10rpx;" mode="" />
           </view>
           <view class="text">
-            璁㈠崟澶囨敞锛�<text>{{item.remark?item.remark:'--'}}</text>
+            鏁呴殰鎻忚堪锛�<text>{{item.remark?item.remark:'--'}}</text>
           </view>
           <view class="time" wx:if='{{item.receiveTime}}'>
             <image class="timeicon" src="/images/time.png"></image>
@@ -114,7 +118,7 @@
     <view class="listBox">
       <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
         <view class="heard">
-          <view class="htext">{{item.device.deviceName}}</view>
+          <view class="htext">ID{{item.id}} | {{ item.device.deviceName}}</view>
         </view>
         <view class="body">
           <view class="h2txt">
@@ -122,7 +126,9 @@
             璁㈠崟璇︽儏锛�
           </view>
           <view class="text">鐢ㄦ埛濮撳悕锛歿{item.userName}}</view>
-          <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}} <van-icon data-base='{{item}}' bind:tap="call" name="phone" style="font-size: 18px;color: #1E90FF;position: relative;top: 3px;" /></view>
+          <view class="text">鐢ㄦ埛鐢佃瘽锛歿{item.userPhone}}
+            <van-icon data-base='{{item}}' bind:tap="call" name="phone" style="font-size: 18px;color: #1E90FF;position: relative;top: 3px;" />
+          </view>
           <view class="text" wx:if="{{roleKey!='tenantservice'}}">
             缁翠慨宸ヤ汉锛�<text>{{item.erectoName?item.erectoName:'--'}}</text>
           </view>
@@ -130,11 +136,11 @@
             棰勭害鏃堕棿锛�<text>{{item.appointmentTime?item.appointmentTime:'--'}}</text>
           </view>
           <view class="text" data-base='{{item}}' bind:tap="goAddress">
-            缁翠慨鍦扮偣锛�<text>{{item.address}}</text>
+            缁翠慨鍦板潃锛�<text>{{item.address}}</text>
             <image class="timeicon" src="/images/ProRep/weizhi.png" style="margin-left: 10rpx;" mode="" />
           </view>
           <view class="text">
-            璁㈠崟澶囨敞锛�<text>{{item.remark?item.remark:'--'}}</text>
+            鏁呴殰鎻忚堪锛�<text>{{item.remark?item.remark:'--'}}</text>
           </view>
           <view class="time" wx:if='{{item.receiveTime}}'>
             <image class="timeicon" src="/images/time.png"></image>
@@ -158,7 +164,7 @@
     <view class="listBox">
       <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
         <view class="heard">
-          <view class="htext">{{item.device.deviceName}}</view>
+          <view class="htext">ID{{item.id}} | {{ item.device.deviceName}}</view>
         </view>
         <view class="body">
           <view class="h2txt">
@@ -177,11 +183,11 @@
             棰勭害鏃堕棿锛�<text>{{item.appointmentTime?item.appointmentTime:'--'}}</text>
           </view>
           <view class="text" data-base='{{item}}' bind:tap="goAddress">
-            缁翠慨鍦扮偣锛�<text>{{item.address}}</text>
+            缁翠慨鍦板潃锛�<text>{{item.address}}</text>
             <image class="timeicon" src="/images/ProRep/weizhi.png" style="margin-left: 10rpx;" mode="" />
           </view>
           <view class="text">
-            璁㈠崟澶囨敞锛�<text>{{item.remark?item.remark:'--'}}</text>
+            鏁呴殰鎻忚堪锛�<text>{{item.remark?item.remark:'--'}}</text>
           </view>
           <view class="time" wx:if='{{item.receiveTime}}'>
             <image class="timeicon" src="/images/time.png"></image>
@@ -191,7 +197,7 @@
         <view class="footer">
           <view class="libtn">
             <!-- 淇敼 -->
-            <view class="btn btn-jd" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="statements">
+            <view class="btn btn-ck" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="yetstatements">
               <van-icon name="browsing-history-o" class="icon" />
               <text>鏌ョ湅</text>
             </view>
@@ -209,9 +215,11 @@
 
 <view class="page-control" wx:if="{{showPage}}">
   <view class="page-control-btns">
-    <view class="page-btn {{prevBtnDis?'btn-disabled':''}}" bindtap="prevPage">涓婁竴椤�</view>
+    <!-- class="page-btn {{prevBtnDis?'btn-disabled':''}}" -->
+    <button class="page-btn {{total<=1||index==1?'btn-disabled':''}}" disabled="{{total<=1||index==1}}" bindtap="prevPage">涓婁竴椤�</button>
     <view class="page-number" bindtap="shopPagePopup"><text>{{index}}</text>/<text>{{total}}</text></view>
-    <view class="page-btn {{nextBtnDis?'btn-disabled':''}}" bindtap="nextPage">涓嬩竴椤�</view>
+    <button class="page-btn {{total<=1||index==total?'btn-disabled':''}}" disabled="{{total<=1||index==total}}" bindtap="nextPage">涓嬩竴椤�</button>
+    <!-- class="page-btn {{nextBtnDis?'btn-disabled':''}}" -->
   </view>
   <view class="page-container" hidden="{{!pageMask}}">
     <view class="page-mask" bindtap="hidePagePopup"></view>
diff --git a/GoldC/pages/problemListwx/problemListwx.wxss b/GoldC/pages/problemListwx/problemListwx.wxss
index f7ec4de..2db1283 100644
--- a/GoldC/pages/problemListwx/problemListwx.wxss
+++ b/GoldC/pages/problemListwx/problemListwx.wxss
@@ -129,6 +129,9 @@
 .btn-jd{
   background-color: #13CE66;
 }
+.btn-ck{
+  background-color: #FF8C00;
+}
 .btn-adit{
   background-color: #1E90FF;
 }
diff --git a/GoldC/pages/problemReport/proRep.js b/GoldC/pages/problemReport/proRep.js
index 93902c1..66e267c 100644
--- a/GoldC/pages/problemReport/proRep.js
+++ b/GoldC/pages/problemReport/proRep.js
@@ -41,13 +41,12 @@
     selectDate: '',
     paramsInfo: {},
     showJD: false,
-    view:false,
+    view: false,
   },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad: function (options) {
-
     if (options && options.info) {
       let info = JSON.parse(options.info)
       console.log(info);
@@ -58,18 +57,16 @@
         time: info.appointmentTime,
         deviceIndex: 0,
         deviceList2: [info.device.deviceName],
-        erectoIndex: 0,
-        erectoList2: [info.erectoName],
-        view:info.imgUrl?true:false
-
+        // erectoIndex: 0,
+        // erectoList2: [info.erectoName],
+        view: info.imgUrl ? true : false
       })
       wx.setNavigationBarTitle({
-        title: this.data.form.device.deviceName
+        title: 'ID' + this.data.form.id + ' | ' + this.data.form.device.deviceName
       })
-    } else {
-      this.getErectoList()
-      this.getDeviceList()
     }
+    this.getErectoList()
+    this.getDeviceList()
   },
   changeUserName(e) {
     this.data.form.userName = e.detail.value
@@ -88,7 +85,7 @@
   },
   Yes() {
     console.log(this.data.form);
-    
+
     if (this.data.form.state == 3) {
       if (!this.data.form.imgUrl) {
         wx.showToast({
@@ -97,7 +94,7 @@
         });
         return
       }
-      this.data.form.orderType='1'
+      this.data.form.orderType = '1'
       if (this.data.form.appointmentTime) {
         this.data.form.appointmentTime += ':00'
       }
@@ -280,9 +277,9 @@
         "Access-Control-Allow-Headers": 'token',
         Authorization: `Bearer ${wx.getStorageSync('token')}`
       },
-      params: data,
+      data: data,
       success: (res, header) => {
-        if (res.data.code != 200) {
+        if (res.data.code != 200 || res.data.rows.length == 0) {
           wx.showToast({
             title: res.data.msg,
             icon: 'none'
@@ -306,9 +303,10 @@
     let data = {
       pageNum: 1,
       pageSize: 10000,
-      deptId: wx.setStorageSync('deptId'),
+      deptId: wx.getStorageSync('deptId'),
       isAuthentication: 1
     }
+    console.log(data);
     wx.request({
       url: 'https://puyue.yhupai.com/prod-api/system/user/list',
       method: "GET",
@@ -316,7 +314,7 @@
         "Access-Control-Allow-Headers": 'token',
         Authorization: `Bearer ${wx.getStorageSync('token')}`
       },
-      params: data,
+      data: data,
       success: (res, header) => {
         if (res.data.code != 200) {
           wx.showToast({
@@ -324,20 +322,35 @@
             icon: 'none'
           });
         } else {
-          let data = []
+          console.log(res);
+          
+          res.data.rows.unshift({
+            nickName:'鏈寚娲�',
+            erectoId:-1
+          })
+          let data1 = []
           for (let i = 0; i < res.data.rows.length; i++) {
-            data.push(res.data.rows[i].nickName)
+            data1.push(res.data.rows[i].nickName)
           }
-          data.unshift(
-            '鏈寚娲�'
-          )
           this.setData({
             erectoList1: res.data.rows,
-            erectoList2: data
+            erectoList2: data1
           })
-
-          this.data.form.erectoId = -1
-          this.data.form.erectoName = '鏈寚娲�'
+          
+          if (this.data.showJD) {
+            console.log(11111111111);
+            for (let i = 0; i < this.data.erectoList1.length; i++) {
+              if (this.data.erectoList1[i].userId == this.data.paramsInfo.erectoId) {
+                console.log(i);
+                this.setData({
+                  erectoIndex: i,
+                })
+              }
+            }
+          } else {
+            this.data.form.erectoId = -1
+            this.data.form.erectoName = '鏈寚娲�'
+          }
         }
       }
     })
@@ -371,8 +384,9 @@
         form: item
       })
       // this.data.form.state = 1
-      this.data.form.erectoId = this.data.erectoList1[Number(e.detail.value)-1].userId
-      this.data.form.erectoName = this.data.erectoList1[Number(e.detail.value)-1].nickName
+      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.form);
     }
     console.log(this.data.erectoList1, this.data.erectoList2, e.detail.value, this.data.form);
 
@@ -609,7 +623,7 @@
       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
+        time: year + '-' + month + '-' + day + ' ' + hour + ':' + minute, //璁剧疆褰撳墠鏃堕棿 锛宑urrentYears+'-'+mm+'-'+dd+' '+hh+':'+min
         year: year,//璁板綍閫夋嫨鐨勫勾
         month: month,//璁板綍閫夋嫨鐨勬湀
         day: day,//璁板綍閫夋嫨鐨勬棩
diff --git a/GoldC/pages/problemReport/proRep.json b/GoldC/pages/problemReport/proRep.json
index f48fb7f..0c836a1 100644
--- a/GoldC/pages/problemReport/proRep.json
+++ b/GoldC/pages/problemReport/proRep.json
@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "van-rate": "/miniprogram_npm/vant-weapp/rate/index"
 
   },
   "navigationBarTitleText": "瀹夎涓嬪崟"
diff --git a/GoldC/pages/problemReport/proRep.wxml b/GoldC/pages/problemReport/proRep.wxml
index 7b7668b..3342b1a 100644
--- a/GoldC/pages/problemReport/proRep.wxml
+++ b/GoldC/pages/problemReport/proRep.wxml
@@ -15,17 +15,17 @@
 <view>
   <view class="title">
     <image class="primg" src="/images/ProRep/name.png"></image>
-    <view>瀹夎宸�</view>
+    <view>瀹夎宸ヤ汉</view>
   </view>
-  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled='{{showJD&&form.state>0}}'>
-    <view class="chose">{{erectoList2[erectoIndex]?erectoList2[erectoIndex]:'璇烽�夋嫨瀹夎宸�'}}</view>
+  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled='{{showJD&&form.state>1}}'>
+    <view class="chose">{{erectoList2[erectoIndex]?erectoList2[erectoIndex]:'璇烽�夋嫨瀹夎宸ヤ汉'}}</view>
   </picker>
 </view>
 
 <view>
   <view class="title">
     <image class="primg" src="/images/ProRep/gongsixiangmu.png"></image>
-    <view>鐘舵��</view>
+    <view>璁㈠崟鐘舵��</view>
   </view>
   <radio-group bindchange="radioChange" style="padding-left: 5%;">
     <label>
@@ -41,7 +41,7 @@
       <radio value="3" checked="{{form.state==3}}" disabled='{{true}}'>宸插畬鎴�</radio>
     </label>
   </radio-group>
-  <!-- <van-radio-group value="{{ from.state }}"  direction="horizontal">
+  <!-- <van-radio-group value="{{ form.state }}"  direction="horizontal">
     <van-radio name="0">鏈寚娲�</van-radio>
     <van-radio name="1">宸叉淳鍗�</van-radio>
     <van-radio name="2">宸叉帴鍗�</van-radio>
@@ -59,9 +59,9 @@
 <view>
   <view class="title">
     <image class="primg" src="/images/ProRep/uptext.png"></image>
-    <view>鎵嬫満鍙�</view>
+    <view>鐢ㄦ埛鐢佃瘽</view>
   </view>
-  <input bindinput="changePhone" value="{{form.userPhone}}" disabled="{{view}}" class="textbox" placeholder="璇疯緭鍏ユ墜鏈哄彿"></input>
+  <input bindinput="changePhone" value="{{form.userPhone}}" disabled="{{view}}" class="textbox" placeholder="璇疯緭鍏ョ敤鎴风數璇�"></input>
 </view>
 <view>
   <view class="title">
@@ -86,9 +86,9 @@
 <view>
   <view class="title">
     <image class="primg" src="/images/ProRep/uptext.png"></image>
-    <view>澶囨敞</view>
+    <view>璁㈠崟澶囨敞</view>
   </view>
-  <textarea bindinput="changeRemark" disabled="{{view}}" class="textbox" value="{{form.remark}}" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�..."></textarea>
+  <textarea bindinput="changeRemark" disabled="{{view}}" class="textbox" value="{{form.remark?form.remark:view?' ':''}}" placeholder="璇疯緭鍏ヨ鍗曞娉ㄥ唴瀹�..."></textarea>
 </view>
 <view wx:if="{{view }}">
   <view class="title">
@@ -114,11 +114,24 @@
     <!-- <view>灏哄鍦�512*512浠ュ唴锛屽ぇ灏忓湪500kb浠ュ唴</view> -->
   </view>
 </view>
-
+<view wx:if="{{form&&form.isRate}}">
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛璇勫垎</view>
+  </view>
+  <van-rate disabled value="{{ form.isRate }}" size="{{25}}" color="#EE0A24"  />
+</view>
+<view wx:if="{{form&&form.isRate}}">
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛璇勪环</view>
+  </view>
+  <textarea  disabled class="textbox" value="{{form.evaluate}}" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�..."></textarea>
+</view>
 
 <!-- <view class="addressBtn" bindtap="openBaiduMap">鎵撳紑鐧惧害鍦板浘</view> -->
 <!-- footer -->
-<view class="footer">
+<view class="footer" wx:if="{{form&&!form.isRate}}">
   <button class="btnC" disabled="{{view}}" bindtap="Cancel">鍙栨秷</button>
   <button class="btnY" disabled="{{view}}" bindtap="Yes">鎻愪氦</button>
   <!-- <button class="btnY" bindtap="test">test</button> -->
diff --git a/GoldC/pages/problemReport/proRep.wxss b/GoldC/pages/problemReport/proRep.wxss
index e65829f..68b1695 100644
--- a/GoldC/pages/problemReport/proRep.wxss
+++ b/GoldC/pages/problemReport/proRep.wxss
@@ -1,4 +1,13 @@
 /* pages/problemReport/proRep.wxss */
+
+.van-rate {
+  width: 60%;
+  justify-content: center;
+  display: flex;
+}
+.rateItem{
+  color: #909399;
+}
 .title{
   width: 90vw;
   margin: 10rpx auto;
diff --git a/GoldC/pages/prorepwx/prorepwx.js b/GoldC/pages/prorepwx/prorepwx.js
index d2da333..ab8d692 100644
--- a/GoldC/pages/prorepwx/prorepwx.js
+++ b/GoldC/pages/prorepwx/prorepwx.js
@@ -58,18 +58,17 @@
         time: info.appointmentTime,
         deviceIndex: 0,
         deviceList2: [info.device.deviceName],
-        erectoIndex: 0,
-        erectoList2: [info.erectoName],
+        // erectoIndex: 0,
+        // erectoList2: [info.erectoName],
         view:info.imgUrl?true:false
 
       })
       wx.setNavigationBarTitle({
-        title: this.data.form.device.deviceName
+        title:'ID'+this.data.form.id+' | '+this.data.form.device.deviceName
       })
-    } else {
-      this.getErectoList()
-      this.getDeviceList()
     }
+    this.getErectoList()
+    this.getDeviceList()
   },
   changeUserName(e) {
     this.data.form.userName = e.detail.value
@@ -286,7 +285,7 @@
         "Access-Control-Allow-Headers": 'token',
         Authorization: `Bearer ${wx.getStorageSync('token')}`
       },
-      params: data,
+      data: data,
       success: (res, header) => {
         if (res.data.code != 200) {
           wx.showToast({
@@ -312,7 +311,7 @@
     let data = {
       pageNum: 1,
       pageSize: 10000,
-      deptId: wx.setStorageSync('deptId'),
+      deptId: wx.getStorageSync('deptId'),
       isAuthentication: 1
     }
     wx.request({
@@ -322,7 +321,7 @@
         "Access-Control-Allow-Headers": 'token',
         Authorization: `Bearer ${wx.getStorageSync('token')}`
       },
-      params: data,
+      data: data,
       success: (res, header) => {
         if (res.data.code != 200) {
           wx.showToast({
@@ -330,20 +329,35 @@
             icon: 'none'
           });
         } else {
-          let data = []
+          console.log(res);
+          
+          res.data.rows.unshift({
+            nickName:'鏈寚娲�',
+            erectoId:-1
+          })
+          let data1 = []
           for (let i = 0; i < res.data.rows.length; i++) {
-            data.push(res.data.rows[i].nickName)
+            data1.push(res.data.rows[i].nickName)
           }
-          data.unshift(
-            '鏈寚娲�'
-          )
           this.setData({
             erectoList1: res.data.rows,
-            erectoList2: data
+            erectoList2: data1
           })
-
-          this.data.form.erectoId = -1
-          this.data.form.erectoName = '鏈寚娲�'
+          
+          if (this.data.showJD) {
+            console.log(11111111111);
+            for (let i = 0; i < this.data.erectoList1.length; i++) {
+              if (this.data.erectoList1[i].userId == this.data.paramsInfo.erectoId) {
+                console.log(i);
+                this.setData({
+                  erectoIndex: i,
+                })
+              }
+            }
+          } else {
+            this.data.form.erectoId = -1
+            this.data.form.erectoName = '鏈寚娲�'
+          }
         }
       }
     })
@@ -376,8 +390,8 @@
       this.setData({
         form: item
       })
-      this.data.form.erectoId = this.data.erectoList1[Number(e.detail.value)-1].userId
-      this.data.form.erectoName = this.data.erectoList1[Number(e.detail.value)-1].nickName
+      this.data.form.erectoId = this.data.erectoList1[Number(e.detail.value)].userId
+      this.data.form.erectoName = this.data.erectoList1[Number(e.detail.value)].nickName
     }
 
   },
@@ -612,7 +626,7 @@
       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
+        time: year + '-' + month + '-' + day + ' ' + hour + ':' + minute, //璁剧疆褰撳墠鏃堕棿 锛宑urrentYears+'-'+mm+'-'+dd+' '+hh+':'+min
         year: year,//璁板綍閫夋嫨鐨勫勾
         month: month,//璁板綍閫夋嫨鐨勬湀
         day: day,//璁板綍閫夋嫨鐨勬棩
diff --git a/GoldC/pages/prorepwx/prorepwx.json b/GoldC/pages/prorepwx/prorepwx.json
index 6e6ea64..a3e1b7d 100644
--- a/GoldC/pages/prorepwx/prorepwx.json
+++ b/GoldC/pages/prorepwx/prorepwx.json
@@ -1,6 +1,6 @@
 {
   "usingComponents": {
-
+    "van-rate": "/miniprogram_npm/vant-weapp/rate/index"
   },
   "navigationBarTitleText": "缁翠慨涓嬪崟"
 }
\ No newline at end of file
diff --git a/GoldC/pages/prorepwx/prorepwx.wxml b/GoldC/pages/prorepwx/prorepwx.wxml
index 3d47dda..58ae19f 100644
--- a/GoldC/pages/prorepwx/prorepwx.wxml
+++ b/GoldC/pages/prorepwx/prorepwx.wxml
@@ -15,17 +15,17 @@
 <view>
   <view class="title">
     <image class="primg" src="/images/ProRep/name.png"></image>
-    <view>缁翠慨宸�</view>
+    <view>缁翠慨宸ヤ汉</view>
   </view>
-  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled='{{showJD&&form.state>0}}'>
-    <view class="chose">{{erectoList2[erectoIndex]?erectoList2[erectoIndex]:'璇烽�夋嫨缁翠慨宸�'}}</view>
+  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled='{{showJD&&form.state>1}}'>
+    <view class="chose">{{erectoList2[erectoIndex]?erectoList2[erectoIndex]:'璇烽�夋嫨缁翠慨宸ヤ汉'}}</view>
   </picker>
 </view>
 
 <view>
   <view class="title">
     <image class="primg" src="/images/ProRep/gongsixiangmu.png"></image>
-    <view>鐘舵��</view>
+    <view>璁㈠崟鐘舵��</view>
   </view>
   <radio-group bindchange="radioChange" style="padding-left: 5%;">
     <label>
@@ -41,7 +41,7 @@
       <radio value="3" checked="{{form.state==3}}" disabled='{{true}}'>宸插畬鎴�</radio>
     </label>
   </radio-group>
-  <!-- <van-radio-group value="{{ from.state }}"  direction="horizontal">
+  <!-- <van-radio-group value="{{ form.state }}"  direction="horizontal">
     <van-radio name="0">鏈寚娲�</van-radio>
     <van-radio name="1">宸叉淳鍗�</van-radio>
     <van-radio name="2">宸叉帴鍗�</van-radio>
@@ -59,9 +59,9 @@
 <view>
   <view class="title">
     <image class="primg" src="/images/ProRep/uptext.png"></image>
-    <view>鎵嬫満鍙�</view>
+    <view>鐢ㄦ埛鐢佃瘽</view>
   </view>
-  <input bindinput="changePhone" value="{{form.userPhone}}" disabled="{{view}}" class="textbox" placeholder="璇疯緭鍏ユ墜鏈哄彿"></input>
+  <input bindinput="changePhone" value="{{form.userPhone}}" disabled="{{view}}" class="textbox" placeholder="璇疯緭鍏ョ敤鎴风數璇�"></input>
 </view>
 <view>
   <view class="title">
@@ -86,9 +86,9 @@
 <view>
   <view class="title">
     <image class="primg" src="/images/ProRep/uptext.png"></image>
-    <view>鏁呴殰鎻忚堪</view>
+    <view>璁㈠崟澶囨敞</view>
   </view>
-  <textarea bindinput="changeRemark" disabled="{{view}}" class="textbox" value="{{form.description}}" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�..."></textarea>
+  <textarea bindinput="changeRemark" disabled="{{view}}" class="textbox" value="{{form.description?form.description:view?' ':''}}" placeholder="璇疯緭鍏ヨ鍗曞娉�..."></textarea>
 </view>
 <view wx:if="{{view }}">
   <view class="title">
@@ -114,11 +114,25 @@
     <!-- <view>灏哄鍦�512*512浠ュ唴锛屽ぇ灏忓湪500kb浠ュ唴</view> -->
   </view>
 </view>
+<view wx:if="{{form&&form.isRate}}">
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛璇勫垎</view>
+  </view>
+  <van-rate disabled value="{{ form.isRate }}" size="{{25}}" color="#EE0A24"  />
+</view>
+<view wx:if="{{form&&form.isRate}}">
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛璇勪环</view>
+  </view>
+  <textarea  disabled class="textbox" value="{{form.evaluate}}" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�..."></textarea>
+</view>
 
 
 <!-- <view class="addressBtn" bindtap="openBaiduMap">鎵撳紑鐧惧害鍦板浘</view> -->
 <!-- footer -->
-<view class="footer">
+<view class="footer" wx:if="{{form&&!form.isRate}}">
   <button class="btnC" disabled="{{view}}" bindtap="Cancel">鍙栨秷</button>
   <button class="btnY" disabled="{{view}}" bindtap="Yes">鎻愪氦</button>
   <!-- <button class="btnY" bindtap="test">test</button> -->
diff --git a/GoldC/pages/prorepwx/prorepwx.wxss b/GoldC/pages/prorepwx/prorepwx.wxss
index e65829f..49a0f29 100644
--- a/GoldC/pages/prorepwx/prorepwx.wxss
+++ b/GoldC/pages/prorepwx/prorepwx.wxss
@@ -65,6 +65,14 @@
   color: #888;
   width: 40%!important;
 }
+.van-rate {
+  width: 60%;
+  justify-content: center;
+  display: flex;
+}
+.rateItem{
+  color: #909399;
+}
 .btnY{
   background-color: #1E90FF;
   color: whitesmoke;
diff --git a/GoldC/pages/yetAZ/components/datePicker.js b/GoldC/pages/yetAZ/components/datePicker.js
new file mode 100644
index 0000000..910f0a6
--- /dev/null
+++ b/GoldC/pages/yetAZ/components/datePicker.js
@@ -0,0 +1,174 @@
+Component({
+  /**
+   * 缁勪欢鐨勫睘鎬у垪琛�
+   */
+  properties: {
+
+  },
+
+  /**
+   * 缁勪欢鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    test: [
+      [],
+      [],
+      [],
+      [],
+      [],
+    ],
+    selectvalue: [1, 2, 3, 4, 5],
+    date: '',
+    time:'01-01'
+  },
+
+  /**
+   * 缁勪欢鐨勬柟娉曞垪琛�
+   */
+  methods: {
+    formatNumber(n){
+      n = n.toString()
+      return n[1] ? n : '0' + n
+    },
+    formatDate(date){
+      const year = date.getFullYear()
+      const month = date.getMonth() + 1
+      const day = date.getDate()
+      return [year, month, day].map(this.formatNumber).map(this.formatNumber).join('-')
+    },
+    // 鍙互灏佽涓鸿幏鍙栨煇骞存煇鏈堢殑澶╂暟
+    mGetDate(year, month) {
+      let d = new Date(year, month, 0);
+      return d.getDate();
+    },
+    //澶氬垪婊氬姩閫夋嫨鍣ㄦ粴鍔ㄦ椂瑙﹀彂浜嬩欢
+    bindcolumnchange(e) {
+      let column = e.detail.column
+      let temp = this.data.selectvalue
+      switch (column) {
+        case 0:
+          temp[0] = e.detail.value
+          this.setData({
+            selectvalue: temp
+          }, () => {
+            let day = this.mGetDate(this.data.selectvalue[0], this.data.selectvalue[1])
+            let days = []
+            for (let i = 1; i <= day; i++) {
+              days.push(i + '鏃�')
+            }
+            let temp_1 = this.data.test
+            temp_1[2] = days
+            this.setData({
+              test: temp_1
+            })
+          })
+          break;
+        case 1:
+          temp[1] = e.detail.value
+          this.setData({
+            selectvalue: temp
+          }, () => {
+            let day = this.mGetDate((this.data.selectvalue[0] + 1), (this.data.selectvalue[1] + 1))
+            let days = []
+            for (let i = 1; i <= day; i++) {
+              days.push(i + '鏃�')
+            }
+            let temp_1 = this.data.test
+            temp_1[2] = days
+            this.setData({
+              test: temp_1
+            })
+          })
+          break;
+        case 2:
+          temp[2] = e.detail.value
+          this.setData({
+            selectvalue: temp
+          })
+          break;
+        case 3:
+          temp[3] = e.detail.value
+          this.setData({
+            selectvalue: temp
+          })
+          break;
+        case 4:
+          temp[4] = e.detail.value
+          this.setData({
+            selectvalue: temp
+          })
+          break;
+      }
+
+      // console.log("绗�" + e.detail.column + "鍒�", "绗�" + e.detail.value + "涓�")
+    },
+    // 纭畾閫夋嫨鏃ユ湡
+    bindchange() {
+      let temp = this.data.selectvalue
+      let year = (this.data.test[0][temp[0]]).substr(0, (this.data.test[0][temp[0]]).length - 1)
+      year = this.addzero(year)
+      let month = (this.data.test[1][temp[1]]).substr(0, (this.data.test[1][temp[1]]).length - 1)
+      month = this.addzero(month)
+      let day = this.data.test[2][temp[2]].substr(0, (this.data.test[2][temp[2]]).length - 1)
+      day = this.addzero(day)
+      let hour = this.data.test[3][temp[3]].substr(0, (this.data.test[3][temp[3]]).length - 1)
+      hour = this.addzero(hour)
+      let minute = this.data.test[4][temp[4]].substr(0, (this.data.test[4][temp[4]]).length - 1)
+      minute = this.addzero(minute)
+      this.setData({
+        date: year + "-" + month + "-" + day,
+        time: hour + ":" + minute,
+        all: year + "-" + month + "-" + day + '' + hour + ":" + minute,
+      }, _ => {
+        this.triggerEvent("pConfirm", {
+          date: year + "-" + month + "-" + day,
+          time: hour + ":" + minute,
+          all: year + "-" + month + "-" + day + '' + hour + ":" + minute,
+        })
+      })
+
+    },
+    //+0
+  addzero(str){
+    if(str.length==1){
+      return "0"+str
+    }else {
+      return str
+    }
+  },
+  },
+  ready() {
+    // 鑾峰彇褰撳墠鏃ユ湡锛堝勾锛屾湀锛屾棩锛�
+    let DATE = (this.formatDate(new Date())).split('-')
+    let year = parseInt(DATE[0])
+    let month = parseInt(DATE[1])
+    let day_1 = parseInt(DATE[2])
+    this.setData({
+      selectvalue: [0, month - 1, day_1 - 1, 0, 0],
+      date: year + "-" + month + "-" + day_1
+    })
+    let years = []
+    let months = ["1鏈�", "2鏈�", "3鏈�", "4鏈�", "5鏈�", "6鏈�", "7鏈�", "8鏈�", "9鏈�", "10鏈�", "11鏈�", "12鏈�"]
+    let days = []
+    let hours = []
+    let minutes = []
+    //鍒ゆ柇褰撳墠鏈堜唤澶╂暟
+    let day = this.mGetDate(year, month)
+    for (let i = 1; i <= day; i++) {
+      days.push(i + '鏃�')
+    }
+    for (let i = 0; i < 30; i++) {
+      years.push(year + i + '骞�')
+    }
+    for (let i = 1; i < 25; i++) {
+      hours.push(i + "鐐�")
+    }
+    for (let i = 0; i < 61; i++) {
+      minutes.push(i + "鍒�")
+    }
+    this.setData({
+      test: [years, months, days, hours, minutes]
+    })
+  }
+})
+
diff --git a/GoldC/pages/yetAZ/components/datePicker.json b/GoldC/pages/yetAZ/components/datePicker.json
new file mode 100644
index 0000000..7ea624a
--- /dev/null
+++ b/GoldC/pages/yetAZ/components/datePicker.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+  
+  }
+}
\ No newline at end of file
diff --git a/GoldC/pages/yetAZ/components/datePicker.wxml b/GoldC/pages/yetAZ/components/datePicker.wxml
new file mode 100644
index 0000000..d2a89c7
--- /dev/null
+++ b/GoldC/pages/yetAZ/components/datePicker.wxml
@@ -0,0 +1,8 @@
+<!--pages/repairTicketDetail/datePicker.wxml-->
+<!-- 缁勪欢 -->
+<view>
+    <picker range="{{test}}" mode="multiSelector" bindcolumnchange='bindcolumnchange' value="{{selectvalue}}" bindchange="bindchange">
+        {{date}} {{time}}
+    </picker>
+</view>
+
diff --git a/GoldC/pages/yetAZ/components/datePicker.wxss b/GoldC/pages/yetAZ/components/datePicker.wxss
new file mode 100644
index 0000000..a6d7490
--- /dev/null
+++ b/GoldC/pages/yetAZ/components/datePicker.wxss
@@ -0,0 +1 @@
+/* pages/repairTicketDetail/datePicker.wxss */
\ No newline at end of file
diff --git a/GoldC/pages/yetAZ/yetAZ.js b/GoldC/pages/yetAZ/yetAZ.js
new file mode 100644
index 0000000..13f232f
--- /dev/null
+++ b/GoldC/pages/yetAZ/yetAZ.js
@@ -0,0 +1,494 @@
+// pages/problemReport/proRep.js
+import { GetManagementClass, GetCompany } from '../../utils/network'
+var util = require('../../utils/network');
+const DatePickerUtil = require('../../utils/DatePicker')
+const app = getApp()
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    imageUrl: [],
+    form: {
+      deviceId: undefined,
+      address: '',//鍦板潃
+      appointmentTime: '',//棰勭害鏃堕棿
+      remark: '',//澶囨敞
+      erectoId: -1,//瀹夎宸�
+      userName: '', //鐢ㄦ埛淇℃伅,鑱旂郴浜�
+      userPhone: '',//鐢ㄦ埛淇℃伅鑱旂郴鐢佃瘽
+      erectoName: '鏈寚娲�',
+      state: 0
+    },
+    deviceIndex: 0,
+    erectoIndex: 0,
+    erectoList1: [],
+    erectoList2: [],
+    deviceList1: [],
+    deviceList2: [],
+    imgUrl: '/images/img.png',
+
+    time: '閫夋嫨棰勭害鏃堕棿',
+    multiArray: [],//piker鐨刬tem椤�
+    multiIndex: [],//褰撳墠閫夋嫨鍒楃殑涓嬫爣
+    year: '',//閫夋嫨鐨勫勾
+    month: '',//閫夋嫨鐨勬湀
+    day: '',//閫夋嫨鐨勬棩
+    hour: '',//閫夋嫨鐨勬椂
+    minute: '',//閫夋嫨鐨勫垎
+    showDate: false,
+    selectDate: '',
+    paramsInfo: {},
+    showJD: false,
+    view: false,
+  },
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad: function (options) {
+    if (options && options.info) {
+      let info = JSON.parse(options.info)
+      console.log(info);
+      this.setData({
+        showJD: true,
+        paramsInfo: info,
+        form: info,
+        time: info.appointmentTime,
+        deviceIndex: 0,
+        deviceList2: [info.device.deviceName],
+        erectoIndex: 0,
+        erectoList2: [info.erectoName],
+      })
+      wx.setNavigationBarTitle({
+        title:'ID'+this.data.form.id+' | '+this.data.form.device.deviceName
+      })
+      if(this.data.form.erectoId==-1){
+        this.getErectoList() 
+      }
+    } 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
+  },
+
+  
+  getDeviceList() {
+    let data = {
+      status: 1
+    }
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/iot/device/shortList',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      data: data,
+      success: (res, header) => {
+        if (res.data.code != 200||res.data.rows.length==0) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          let data = []
+          for (let i = 0; i < res.data.rows.length; i++) {
+            data.push(res.data.rows[i].deviceName)
+          }
+          this.setData({
+            deviceList1: res.data.rows,
+            deviceList2: data
+          })
+          this.data.form.deviceId = res.data.rows[0].deviceId
+          this.data.form.deviceName = res.data.rows[0].deviceName
+        }
+      }
+    })
+  },
+  getErectoList() {
+    let data = {
+      pageNum: 1,
+      pageSize: 10000,
+      deptId: wx.getStorageSync('deptId'),
+      isAuthentication: 1
+    }
+    console.log(data);
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/system/user/list',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      data: data,
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          let data = []
+          for (let i = 0; i < res.data.rows.length; i++) {
+            data.push(res.data.rows[i].nickName)
+          }
+          data.unshift(
+            '鏈寚娲�'
+          )
+          this.setData({
+            erectoList1: res.data.rows,
+            erectoList2: data
+          })
+
+          this.data.form.erectoId = -1
+          this.data.form.erectoName = '鏈寚娲�'
+        }
+      }
+    })
+  },
+  bindPicker(e) {
+    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) {
+    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) - 1].userId
+      this.data.form.erectoName = this.data.erectoList1[Number(e.detail.value) - 1].nickName
+    }
+    console.log(this.data.erectoList1, this.data.erectoList2, e.detail.value, this.data.form);
+
+
+  },
+  openShowDate() {
+    this.setData({
+      showDate: true
+    })
+  },
+  bindMultiPickerChange: function (e) { //鏃堕棿鏃ユ湡picker閫夋嫨鏀瑰彉鍚庯紝鐐瑰嚮纭畾 
+    // console.log('picker鍙戦�侀�夋嫨鏀瑰彉锛屾惡甯﹀�间负', e.detail.value)
+    this.setData({
+      multiIndex: e.detail.value
+    })
+    const index = this.data.multiIndex; // 褰撳墠閫夋嫨鍒楃殑涓嬫爣
+    const year = this.data.multiArray[0][index[0]];
+    const month = this.data.multiArray[1][index[1]];
+    const day = this.data.multiArray[2][index[2]];
+    const hour = this.data.multiArray[3][index[3]];
+    const minute = this.data.multiArray[4][index[4]];
+    // console.log(`${year}-${month}-${day} ${hour}:${minute}`); 
+
+    this.setData({
+      time: (year + month + day + ' ' + hour.replace('鏃�', '') + ':' + minute.replace('鍒�', '')).replace('骞�', '-').replace('鏈�', '-').replace('鏃�', ''),
+      year: year, //璁板綍閫夋嫨鐨勫勾
+      month: month, //璁板綍閫夋嫨鐨勬湀
+      day: day, //璁板綍閫夋嫨鐨勬棩
+      hour: hour, //璁板綍閫夋嫨鐨勬椂
+      minute: minute, //璁板綍閫夋嫨鐨勫垎 
+    })
+    this.data.form.appointmentTime = this.data.time
+  },
+  bindMultiPickerColumnChange: function (e) { //鐩戝惉picker鐨勬粴鍔ㄤ簨浠�
+
+    // console.log('淇敼鐨勫垪涓�', e.detail.column, '锛屽�间负', e.detail.value);
+
+    let getCurrentDate = DatePickerUtil.getCurrentDate();//鑾峰彇鐜板湪鏃堕棿  
+    let currentYear = parseInt(getCurrentDate.substring(0, 4));
+    let currentMonth = parseInt(getCurrentDate.substring(5, 7));
+    let currentDay = parseInt(getCurrentDate.substring(8, 10));
+    let currentHour = parseInt(getCurrentDate.substring(11, 13));
+    let currentMinute = parseInt(getCurrentDate.substring(14, 16));
+
+    if (e.detail.column == 0) {//淇敼骞翠唤鍒� 
+
+      let yearSelected = parseInt(this.data.multiArray[e.detail.column][e.detail.value]);//褰撳墠閫夋嫨鐨勫勾浠�
+
+      this.setData({
+        multiIndex: [0, 0, 0, 0, 0],//璁剧疆pickerIndex
+        year: yearSelected //褰撳墠閫夋嫨鐨勫勾浠�
+      });
+
+      if (yearSelected == currentYear) {//褰撳墠閫夋嫨鐨勫勾浠�==褰撳墠骞翠唤  
+        var loadPickerData = DatePickerUtil.loadPickerData();
+
+        this.setData({
+          multiArray: loadPickerData,//picker鏁扮粍璧嬪��
+          multiIndex: [0, 0, 0, 0, 0] //璁剧疆pickerIndex
+        });
+
+      } else {  // 閫夋嫨鐨勫勾浠斤紒=褰撳墠骞翠唤 
+
+        // 澶勭悊鏈堜唤
+        let monthArr = DatePickerUtil.loadMonths(1, 12)
+        // 澶勭悊鏃ユ湡
+        let dayArr = DatePickerUtil.loadDays(currentYear, currentMonth, 1)
+        // 澶勭悊hour
+        let hourArr = DatePickerUtil.loadHours(0, 24);
+        // 澶勭悊minute
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+        // 缁欐瘡鍒楄祴鍊煎洖鍘�
+        this.setData({
+          ['multiArray[1]']: monthArr,
+          ['multiArray[2]']: dayArr,
+          ['multiArray[3]']: hourArr,
+          ['multiArray[4]']: minuteArr
+        });
+      }
+    }
+    if (e.detail.column == 1) {//淇敼鏈堜唤鍒�
+      let mon = parseInt(this.data.multiArray[e.detail.column][e.detail.value]); //褰撳墠閫夋嫨鐨勬湀浠�
+      this.setData({
+        month: mon  // 璁板綍褰撳墠鍒�
+      })
+
+      if (mon == currentMonth) {//閫夋嫨鐨勬湀浠�==褰撳墠鏈堜唤 
+        if (this.data.year == currentYear) {
+
+          // 澶勭悊鏃ユ湡
+          let dayArr = DatePickerUtil.loadDays(currentYear, mon, currentDay)
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(currentHour, 24);
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(currentMinute, 60)
+
+          this.setData({
+            ['multiArray[2]']: dayArr,
+            ['multiArray[3]']: hourArr,
+            ['multiArray[4]']: minuteArr
+          })
+        } else {
+          // 澶勭悊鏃ユ湡
+          let dayArr = DatePickerUtil.loadDays(currentYear, mon, 1)
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(0, 24);
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+          this.setData({
+            ['multiArray[2]']: dayArr,
+            ['multiArray[3]']: hourArr,
+            ['multiArray[4]']: minuteArr
+          });
+        }
+      } else {  // 閫夋嫨鐨勬湀浠斤紒=褰撳墠鏈堜唤 
+        // 澶勭悊鏃ユ湡
+        let dayArr = DatePickerUtil.loadDays(currentYear, mon, 1) // 浼犲叆褰撳墠骞翠唤锛屽綋鍓嶉�夋嫨鐨勬湀浠藉幓璁＄畻鏃�
+        // 澶勭悊hour
+        let hourArr = DatePickerUtil.loadHours(0, 24);
+        // 澶勭悊minute
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+        this.setData({
+          ['multiArray[2]']: dayArr,
+          ['multiArray[3]']: hourArr,
+          ['multiArray[4]']: minuteArr
+        });
+      }
+    }
+    if (e.detail.column == 2) {//淇敼鏃�
+      let dd = parseInt(this.data.multiArray[e.detail.column][e.detail.value]);//褰撳墠閫夋嫨鐨勬棩
+      this.setData({
+        day: dd
+      })
+      if (dd == currentDay) {//閫夋嫨鐨勬棩==褰撳墠鏃�
+        if (this.data.year == currentYear && this.data.month == currentMonth) {//閫夋嫨鐨勬槸浠婂ぉ 
+
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(currentHour, 24);
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(currentMinute, 60)
+
+          this.setData({
+            ['multiArray[3]']: hourArr,
+            ['multiArray[4]']: minuteArr
+          });
+
+        } else { //閫夋嫨鐨勪笉鏄粖澶� 
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(0, 24);
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+          this.setData({
+            ['multiArray[3]']: hourArr,
+            ['multiArray[4]']: minuteArr
+          });
+        }
+      } else {  // 閫夋嫨鐨勬棩锛�=褰撳墠鏃� 
+        // 澶勭悊hour
+        let hourArr = DatePickerUtil.loadHours(0, 24);
+        // 澶勭悊minute
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+        this.setData({
+          ['multiArray[3]']: hourArr,
+          ['multiArray[4]']: minuteArr
+        });
+      }
+    }
+    if (e.detail.column == 3) {//淇敼鏃�
+      let hh = parseInt(this.data.multiArray[e.detail.column][e.detail.value]); //褰撳墠閫夋嫨鐨勬椂
+      this.setData({
+        hour: hh
+      })
+      if (hh == currentHour) {//閫夋嫨鐨勬椂==褰撳墠鏃� 
+        if (this.data.year == currentYear && this.data.month == currentMonth && this.data.month == currentMonth) {   // 閫夋嫨鐨勬槸浠婂ぉ
+
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(currentMinute, 60)
+          this.setData({
+            ['multiArray[4]']: minuteArr
+          });
+        } else { // 閫夋嫨鐨勪笉鏄粖澶�
+
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+          this.setData({
+            ['multiArray[4]']: minuteArr
+          });
+        }
+      } else {//閫夋嫨鐨勬椂锛�=褰撳墠鏃� 
+        // 澶勭悊minute
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+        this.setData({
+          ['multiArray[4]']: minuteArr
+        });
+      }
+    }
+    var data = {
+      multiArray: this.data.multiArray,
+      multiIndex: this.data.multiIndex
+    };
+
+    // console.log('淇敼鐨勫垪涓�', e.detail.column, '锛屽�间负', e.detail.value);
+    data.multiIndex[e.detail.column] = e.detail.value; //灏嗗�艰祴鍥炲幓
+
+    this.setData(data);  //灏嗗�艰祴鍥炲幓
+  },
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow: function () {
+
+    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()
+      //杩欓噷鍐欑殑鏄负浜嗚褰曞綋鍓嶆椂闂�
+      let year = parseInt(getCurrentDate.substring(0, 4));
+      let month = parseInt(getCurrentDate.substring(5, 7));
+      let day = parseInt(getCurrentDate.substring(8, 10));
+      let hour = parseInt(getCurrentDate.substring(11, 13));
+      let minute = parseInt(getCurrentDate.substring(14, 16));
+      this.setData({
+        multiArray: loadPickerData,//picker鏁扮粍璧嬪�硷紝鏍煎紡 [years, months, days, hours, minutes]
+        multiIndex: GetMultiIndex,//璁剧疆pickerIndex锛孾0,0,0,0,0]
+        time: getCurrentDate.replace('骞�', '-').replace('鏈�', '-').replace('鏃�', ' '), //璁剧疆褰撳墠鏃堕棿 锛宑urrentYears+'-'+mm+'-'+dd+' '+hh+':'+min
+        year: year,//璁板綍閫夋嫨鐨勫勾
+        month: month,//璁板綍閫夋嫨鐨勬湀
+        day: day,//璁板綍閫夋嫨鐨勬棩
+        hour: hour,//璁板綍閫夋嫨鐨勬椂
+        minute: minute,//璁板綍閫夋嫨鐨勫垎 
+      });
+    }
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/GoldC/pages/yetAZ/yetAZ.json b/GoldC/pages/yetAZ/yetAZ.json
new file mode 100644
index 0000000..b449e68
--- /dev/null
+++ b/GoldC/pages/yetAZ/yetAZ.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-rate": "/miniprogram_npm/vant-weapp/rate/index"
+
+  },
+  "navigationBarTitleText": "鏌ョ湅瀹夎鍗�"
+}
\ No newline at end of file
diff --git a/GoldC/pages/yetAZ/yetAZ.wxml b/GoldC/pages/yetAZ/yetAZ.wxml
new file mode 100644
index 0000000..2c36068
--- /dev/null
+++ b/GoldC/pages/yetAZ/yetAZ.wxml
@@ -0,0 +1,115 @@
+<!--pages/problemReport/proRep.wxml-->
+
+<!-- 璇勫畾椤圭洰 -->
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/pingding.png"></image>
+    <view>璁惧</view>
+  </view>
+  <picker bindchange="bindPicker" value="{{deviceIndex}}" range="{{deviceList2}}" disabled>
+    <view class="chose">{{deviceList2[deviceIndex]?deviceList2[deviceIndex]:'璇烽�夋嫨璁惧'}}</view>
+  </picker>
+</view>
+
+<!-- 鍏徃鍚嶇О -->
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/name.png"></image>
+    <view>瀹夎宸ヤ汉</view>
+  </view>
+  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled>
+    <view class="chose">{{erectoList2[erectoIndex]?erectoList2[erectoIndex]:'璇烽�夋嫨瀹夎宸ヤ汉'}}</view>
+  </picker>
+</view>
+
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/gongsixiangmu.png"></image>
+    <view>璁㈠崟鐘舵��</view>
+  </view>
+  <radio-group bindchange="radioChange" style="padding-left: 5%;">
+    <label>
+      <radio value="0" checked="{{form.state==0}}" disabled='{{true}}'>鏈寚娲�</radio>
+    </label>
+    <label>
+      <radio value="1" checked="{{form.state==1}}" disabled='{{true}}'>宸叉淳鍗�</radio>
+    </label>
+    <label>
+      <radio value="2" checked="{{form.state==2}}" disabled='{{true}}'>宸叉帴鍗�</radio>
+    </label>
+    <label>
+      <radio value="3" checked="{{form.state==3}}" disabled='{{true}}'>宸插畬鎴�</radio>
+    </label>
+  </radio-group>
+</view>
+
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛濮撳悕</view>
+  </view>
+  <input bindinput="changeUserName" value="{{form.userName}}" disabled class="textbox"  placeholder="璇疯緭鍏ョ敤鎴峰鍚�"></input>
+</view>
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛鐢佃瘽</view>
+  </view>
+  <input bindinput="changePhone" value="{{form.userPhone}}" disabled class="textbox" placeholder="璇疯緭鍏ョ敤鎴风數璇�"></input>
+</view>
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>瀹夎鍦板潃</view>
+  </view>
+  <input bindinput="changeaddress" value="{{form.address}}" disabled class="textbox" placeholder="璇疯緭鍏ュ畨瑁呭湴鍧�"></input>
+</view>
+
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/name.png"></image>
+    <view>棰勭害鏃堕棿</view>
+  </view>
+  <view bind:tap="openShowDate" style="padding-left: 3%;">
+    <picker bindtap="clickSelectTime" mode="multiSelector" disabled bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
+      <view style="width: 96%;margin-left: 2%;height: 40px;background: #FFFFFF;line-height: 40px;color: #A18080;padding-left: 3%;">{{time}}</view>
+    </picker>
+  </view>
+</view>
+<!-- 涓婃姤闂 -->
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>璁㈠崟澶囨敞</view>
+  </view>
+  <textarea bindinput="changeRemark" disabled class="textbox" value="{{form.remark?form.remark:view?' ':''}}" placeholder="璇疯緭鍏ヨ鍗曞娉ㄥ唴瀹�..."></textarea>
+</view>
+<view wx:if="{{view }}">
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>瀹夎璇佹槑</view>
+  </view>
+  <image class="upphotoimg" src="{{form.imgUrl}}" mode="aspectFill" style="margin-right:15rpx;width: 350rpx;padding-left: 5%;"></image>
+</view>
+<view wx:if="{{form&&!form.isRate}}">
+  <view class="title">
+    <view>瀹㈡埛灏氭湭璇勪环</view>
+  </view>
+</view>
+<view wx:if="{{form&&form.isRate}}">
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛璇勫垎</view>
+  </view>
+  <van-rate  readonly value="{{ form.isRate }}" size="{{25}}" color="#EE0A24"  />
+</view>
+<view wx:if="{{form&&form.isRate}}">
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛璇勪环</view>
+  </view>
+  <textarea  disabled class="textbox" value="{{form.evaluate}}" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�..."></textarea>
+</view>
+
+<!-- 鍗犱綅 -->
+<view style="height:50rpx"></view>
diff --git a/GoldC/pages/yetAZ/yetAZ.wxss b/GoldC/pages/yetAZ/yetAZ.wxss
new file mode 100644
index 0000000..68b1695
--- /dev/null
+++ b/GoldC/pages/yetAZ/yetAZ.wxss
@@ -0,0 +1,119 @@
+/* pages/problemReport/proRep.wxss */
+
+.van-rate {
+  width: 60%;
+  justify-content: center;
+  display: flex;
+}
+.rateItem{
+  color: #909399;
+}
+.title{
+  width: 90vw;
+  margin: 10rpx auto;
+  font-size: 30rpx;
+  font-weight: 600;
+  padding: 10rpx 0 0rpx 0;
+  display: flex;
+  align-items: center;
+}
+.chose{
+  width: 90vw;
+  height: 90rpx;
+  border: 1rpx solid gainsboro;
+  border-radius: 10rpx;
+  margin: 0 auto;
+  line-height: 90rpx;
+  background-color: white;
+  padding-left: 20rpx;
+  box-sizing: border-box;
+  color: #888;
+}
+.textbox{
+  width: 90vw;
+  height: 90rpx;
+  border: 1rpx solid gainsboro;
+  border-radius: 10rpx;
+  background-color: white;
+  margin: 0 auto;
+  text-indent: 20rpx;
+}
+.photoBox{
+  width: 90vw;
+  margin: 0 auto;
+  color: #888;
+  background-color: white;
+  padding: 20rpx 10rpx;
+  box-sizing: border-box;
+  border-radius: 10rpx;
+}
+.upphotoimg{
+  width: 260rpx;
+  height: 200rpx;
+  /* border: 1rpx solid #999; */
+  border-radius: 10rpx;
+}
+.upimgbox{
+  position: relative;
+}
+.removeimg{
+  height: 50rpx;
+  width: 50rpx;
+  position: absolute;
+  /* top: 0; */
+  right: 15rpx;
+}
+.footer{
+  width: 90vw;
+  display: flex;
+  /* margin-top: 30rpx; */
+  margin: 50rpx auto;
+}
+.btnC{
+  background-color: rgb(209, 209, 209);
+  color: #888;
+  width: 40%!important;
+}
+.btnY{
+  background-color: #1E90FF;
+  color: whitesmoke;
+  width: 40%!important;
+}
+.primg{
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 10rpx;
+}
+.map{
+  width: 100%;
+  height: 350rpx;
+  border-radius: 5rpx;
+  margin-top: 20rpx;
+  border: 1rpx solid ghostwhite;
+  display: none;
+}
+.address{
+  width: 100%;
+  height: 90rpx;
+  border: 1rpx solid gainsboro;
+  border-radius: 10rpx;
+  margin: 0 auto;
+  line-height: 90rpx;
+  background-color: white;
+  padding-left: 20rpx;
+  box-sizing: border-box;
+  color: #888;
+}
+.addressBtn{
+  border: 1rpx solid gainsboro;
+  width: 200rpx;
+  /* height: 50rpx; */
+  padding: 3rpx;
+  text-align: center;
+  border-radius: 15rpx;
+  margin-top: 10rpx;
+}
+.addresstit{
+  margin-bottom: 5rpx;
+  color: #555;
+}
\ No newline at end of file
diff --git a/GoldC/pages/yetWX/components/datePicker.js b/GoldC/pages/yetWX/components/datePicker.js
new file mode 100644
index 0000000..910f0a6
--- /dev/null
+++ b/GoldC/pages/yetWX/components/datePicker.js
@@ -0,0 +1,174 @@
+Component({
+  /**
+   * 缁勪欢鐨勫睘鎬у垪琛�
+   */
+  properties: {
+
+  },
+
+  /**
+   * 缁勪欢鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    test: [
+      [],
+      [],
+      [],
+      [],
+      [],
+    ],
+    selectvalue: [1, 2, 3, 4, 5],
+    date: '',
+    time:'01-01'
+  },
+
+  /**
+   * 缁勪欢鐨勬柟娉曞垪琛�
+   */
+  methods: {
+    formatNumber(n){
+      n = n.toString()
+      return n[1] ? n : '0' + n
+    },
+    formatDate(date){
+      const year = date.getFullYear()
+      const month = date.getMonth() + 1
+      const day = date.getDate()
+      return [year, month, day].map(this.formatNumber).map(this.formatNumber).join('-')
+    },
+    // 鍙互灏佽涓鸿幏鍙栨煇骞存煇鏈堢殑澶╂暟
+    mGetDate(year, month) {
+      let d = new Date(year, month, 0);
+      return d.getDate();
+    },
+    //澶氬垪婊氬姩閫夋嫨鍣ㄦ粴鍔ㄦ椂瑙﹀彂浜嬩欢
+    bindcolumnchange(e) {
+      let column = e.detail.column
+      let temp = this.data.selectvalue
+      switch (column) {
+        case 0:
+          temp[0] = e.detail.value
+          this.setData({
+            selectvalue: temp
+          }, () => {
+            let day = this.mGetDate(this.data.selectvalue[0], this.data.selectvalue[1])
+            let days = []
+            for (let i = 1; i <= day; i++) {
+              days.push(i + '鏃�')
+            }
+            let temp_1 = this.data.test
+            temp_1[2] = days
+            this.setData({
+              test: temp_1
+            })
+          })
+          break;
+        case 1:
+          temp[1] = e.detail.value
+          this.setData({
+            selectvalue: temp
+          }, () => {
+            let day = this.mGetDate((this.data.selectvalue[0] + 1), (this.data.selectvalue[1] + 1))
+            let days = []
+            for (let i = 1; i <= day; i++) {
+              days.push(i + '鏃�')
+            }
+            let temp_1 = this.data.test
+            temp_1[2] = days
+            this.setData({
+              test: temp_1
+            })
+          })
+          break;
+        case 2:
+          temp[2] = e.detail.value
+          this.setData({
+            selectvalue: temp
+          })
+          break;
+        case 3:
+          temp[3] = e.detail.value
+          this.setData({
+            selectvalue: temp
+          })
+          break;
+        case 4:
+          temp[4] = e.detail.value
+          this.setData({
+            selectvalue: temp
+          })
+          break;
+      }
+
+      // console.log("绗�" + e.detail.column + "鍒�", "绗�" + e.detail.value + "涓�")
+    },
+    // 纭畾閫夋嫨鏃ユ湡
+    bindchange() {
+      let temp = this.data.selectvalue
+      let year = (this.data.test[0][temp[0]]).substr(0, (this.data.test[0][temp[0]]).length - 1)
+      year = this.addzero(year)
+      let month = (this.data.test[1][temp[1]]).substr(0, (this.data.test[1][temp[1]]).length - 1)
+      month = this.addzero(month)
+      let day = this.data.test[2][temp[2]].substr(0, (this.data.test[2][temp[2]]).length - 1)
+      day = this.addzero(day)
+      let hour = this.data.test[3][temp[3]].substr(0, (this.data.test[3][temp[3]]).length - 1)
+      hour = this.addzero(hour)
+      let minute = this.data.test[4][temp[4]].substr(0, (this.data.test[4][temp[4]]).length - 1)
+      minute = this.addzero(minute)
+      this.setData({
+        date: year + "-" + month + "-" + day,
+        time: hour + ":" + minute,
+        all: year + "-" + month + "-" + day + '' + hour + ":" + minute,
+      }, _ => {
+        this.triggerEvent("pConfirm", {
+          date: year + "-" + month + "-" + day,
+          time: hour + ":" + minute,
+          all: year + "-" + month + "-" + day + '' + hour + ":" + minute,
+        })
+      })
+
+    },
+    //+0
+  addzero(str){
+    if(str.length==1){
+      return "0"+str
+    }else {
+      return str
+    }
+  },
+  },
+  ready() {
+    // 鑾峰彇褰撳墠鏃ユ湡锛堝勾锛屾湀锛屾棩锛�
+    let DATE = (this.formatDate(new Date())).split('-')
+    let year = parseInt(DATE[0])
+    let month = parseInt(DATE[1])
+    let day_1 = parseInt(DATE[2])
+    this.setData({
+      selectvalue: [0, month - 1, day_1 - 1, 0, 0],
+      date: year + "-" + month + "-" + day_1
+    })
+    let years = []
+    let months = ["1鏈�", "2鏈�", "3鏈�", "4鏈�", "5鏈�", "6鏈�", "7鏈�", "8鏈�", "9鏈�", "10鏈�", "11鏈�", "12鏈�"]
+    let days = []
+    let hours = []
+    let minutes = []
+    //鍒ゆ柇褰撳墠鏈堜唤澶╂暟
+    let day = this.mGetDate(year, month)
+    for (let i = 1; i <= day; i++) {
+      days.push(i + '鏃�')
+    }
+    for (let i = 0; i < 30; i++) {
+      years.push(year + i + '骞�')
+    }
+    for (let i = 1; i < 25; i++) {
+      hours.push(i + "鐐�")
+    }
+    for (let i = 0; i < 61; i++) {
+      minutes.push(i + "鍒�")
+    }
+    this.setData({
+      test: [years, months, days, hours, minutes]
+    })
+  }
+})
+
diff --git a/GoldC/pages/yetWX/components/datePicker.json b/GoldC/pages/yetWX/components/datePicker.json
new file mode 100644
index 0000000..7ea624a
--- /dev/null
+++ b/GoldC/pages/yetWX/components/datePicker.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+  
+  }
+}
\ No newline at end of file
diff --git a/GoldC/pages/yetWX/components/datePicker.wxml b/GoldC/pages/yetWX/components/datePicker.wxml
new file mode 100644
index 0000000..d2a89c7
--- /dev/null
+++ b/GoldC/pages/yetWX/components/datePicker.wxml
@@ -0,0 +1,8 @@
+<!--pages/repairTicketDetail/datePicker.wxml-->
+<!-- 缁勪欢 -->
+<view>
+    <picker range="{{test}}" mode="multiSelector" bindcolumnchange='bindcolumnchange' value="{{selectvalue}}" bindchange="bindchange">
+        {{date}} {{time}}
+    </picker>
+</view>
+
diff --git a/GoldC/pages/yetWX/components/datePicker.wxss b/GoldC/pages/yetWX/components/datePicker.wxss
new file mode 100644
index 0000000..a6d7490
--- /dev/null
+++ b/GoldC/pages/yetWX/components/datePicker.wxss
@@ -0,0 +1 @@
+/* pages/repairTicketDetail/datePicker.wxss */
\ No newline at end of file
diff --git a/GoldC/pages/yetWX/yetWX.js b/GoldC/pages/yetWX/yetWX.js
new file mode 100644
index 0000000..0e38528
--- /dev/null
+++ b/GoldC/pages/yetWX/yetWX.js
@@ -0,0 +1,487 @@
+// pages/problemReport/proRep.js
+import { GetManagementClass, GetCompany } from '../../utils/network'
+var util = require('../../utils/network');
+const DatePickerUtil = require('../../utils/DatePicker')
+const app = getApp()
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    imageUrl: [],
+    form: {
+      deviceId: undefined,
+      address: '',//鍦板潃
+      appointmentTime: '',//棰勭害鏃堕棿
+      remark: '',//澶囨敞
+      erectoId: -1,//瀹夎宸�
+      userName: '', //鐢ㄦ埛淇℃伅,鑱旂郴浜�
+      userPhone: '',//鐢ㄦ埛淇℃伅鑱旂郴鐢佃瘽
+      erectoName: '鏈寚娲�',
+      state: 0
+    },
+    deviceIndex: 0,
+    erectoIndex: 0,
+    erectoList1: [],
+    erectoList2: [],
+    deviceList1: [],
+    deviceList2: [],
+    imgUrl: '/images/img.png',
+
+    time: '閫夋嫨棰勭害鏃堕棿',
+    multiArray: [],//piker鐨刬tem椤�
+    multiIndex: [],//褰撳墠閫夋嫨鍒楃殑涓嬫爣
+    year: '',//閫夋嫨鐨勫勾
+    month: '',//閫夋嫨鐨勬湀
+    day: '',//閫夋嫨鐨勬棩
+    hour: '',//閫夋嫨鐨勬椂
+    minute: '',//閫夋嫨鐨勫垎
+    showDate: false,
+    selectDate: '',
+    paramsInfo: {},
+    showJD: false,
+    view:false,
+  },
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad: function (options) {
+    if (options && options.info) {
+      let info = JSON.parse(options.info)
+      this.setData({
+        showJD: true,
+        paramsInfo: info,
+        form: info,
+        time: info.appointmentTime,
+        deviceIndex: 0,
+        deviceList2: [info.device.deviceName],
+        erectoIndex: 0,
+        erectoList2: [info.erectoName],
+      })
+      wx.setNavigationBarTitle({
+        title:'ID'+this.data.form.id+' | '+this.data.form.device.deviceName
+      })
+      if(this.data.form.erectoId==-1){
+        this.getErectoList() 
+      }
+    } 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
+  },
+  getDeviceList() {
+    let data = {
+      repairFlag: 0
+    }
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/iot/device/shortList',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      data: data,
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          let data = []
+          for (let i = 0; i < res.data.rows.length; i++) {
+            data.push(res.data.rows[i].deviceName)
+          }
+          this.setData({
+            deviceList1: res.data.rows,
+            deviceList2: data
+          })
+          this.data.form.deviceId = res.data.rows[0].deviceId
+          this.data.form.deviceName = res.data.rows[0].deviceName
+        }
+      }
+    })
+  },
+  getErectoList() {
+    let data = {
+      pageNum: 1,
+      pageSize: 10000,
+      deptId: wx.getStorageSync('deptId'),
+      isAuthentication: 1
+    }
+    wx.request({
+      url: 'https://puyue.yhupai.com/prod-api/system/user/list',
+      method: "GET",
+      header: {
+        "Access-Control-Allow-Headers": 'token',
+        Authorization: `Bearer ${wx.getStorageSync('token')}`
+      },
+      data: data,
+      success: (res, header) => {
+        if (res.data.code != 200) {
+          wx.showToast({
+            title: res.data.msg,
+            icon: 'none'
+          });
+        } else {
+          let data = []
+          for (let i = 0; i < res.data.rows.length; i++) {
+            data.push(res.data.rows[i].nickName)
+          }
+          data.unshift(
+            '鏈寚娲�'
+          )
+          this.setData({
+            erectoList1: res.data.rows,
+            erectoList2: data
+          })
+
+          this.data.form.erectoId = -1
+          this.data.form.erectoName = '鏈寚娲�'
+        }
+      }
+    })
+  },
+  bindPicker(e) {
+    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) {
+    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.erectoId = this.data.erectoList1[Number(e.detail.value)-1].userId
+      this.data.form.erectoName = this.data.erectoList1[Number(e.detail.value)-1].nickName
+    }
+
+  },
+  openShowDate() {
+    this.setData({
+      showDate: true
+    })
+  },
+  bindMultiPickerChange: function (e) { //鏃堕棿鏃ユ湡picker閫夋嫨鏀瑰彉鍚庯紝鐐瑰嚮纭畾 
+    // console.log('picker鍙戦�侀�夋嫨鏀瑰彉锛屾惡甯﹀�间负', e.detail.value)
+    this.setData({
+      multiIndex: e.detail.value
+    })
+    const index = this.data.multiIndex; // 褰撳墠閫夋嫨鍒楃殑涓嬫爣
+    const year = this.data.multiArray[0][index[0]];
+    const month = this.data.multiArray[1][index[1]];
+    const day = this.data.multiArray[2][index[2]];
+    const hour = this.data.multiArray[3][index[3]];
+    const minute = this.data.multiArray[4][index[4]];
+    // console.log(`${year}-${month}-${day} ${hour}:${minute}`); 
+
+    this.setData({
+      time: (year + month + day + ' ' + hour.replace('鏃�', '') + ':' + minute.replace('鍒�', '')).replace('骞�', '-').replace('鏈�', '-').replace('鏃�', ''),
+      year: year, //璁板綍閫夋嫨鐨勫勾
+      month: month, //璁板綍閫夋嫨鐨勬湀
+      day: day, //璁板綍閫夋嫨鐨勬棩
+      hour: hour, //璁板綍閫夋嫨鐨勬椂
+      minute: minute, //璁板綍閫夋嫨鐨勫垎 
+    })
+    this.data.form.appointmentTime = this.data.time
+  },
+  bindMultiPickerColumnChange: function (e) { //鐩戝惉picker鐨勬粴鍔ㄤ簨浠�
+
+    // console.log('淇敼鐨勫垪涓�', e.detail.column, '锛屽�间负', e.detail.value);
+
+    let getCurrentDate = DatePickerUtil.getCurrentDate();//鑾峰彇鐜板湪鏃堕棿  
+    let currentYear = parseInt(getCurrentDate.substring(0, 4));
+    let currentMonth = parseInt(getCurrentDate.substring(5, 7));
+    let currentDay = parseInt(getCurrentDate.substring(8, 10));
+    let currentHour = parseInt(getCurrentDate.substring(11, 13));
+    let currentMinute = parseInt(getCurrentDate.substring(14, 16));
+
+    if (e.detail.column == 0) {//淇敼骞翠唤鍒� 
+
+      let yearSelected = parseInt(this.data.multiArray[e.detail.column][e.detail.value]);//褰撳墠閫夋嫨鐨勫勾浠�
+
+      this.setData({
+        multiIndex: [0, 0, 0, 0, 0],//璁剧疆pickerIndex
+        year: yearSelected //褰撳墠閫夋嫨鐨勫勾浠�
+      });
+
+      if (yearSelected == currentYear) {//褰撳墠閫夋嫨鐨勫勾浠�==褰撳墠骞翠唤  
+        var loadPickerData = DatePickerUtil.loadPickerData();
+
+        this.setData({
+          multiArray: loadPickerData,//picker鏁扮粍璧嬪��
+          multiIndex: [0, 0, 0, 0, 0] //璁剧疆pickerIndex
+        });
+
+      } else {  // 閫夋嫨鐨勫勾浠斤紒=褰撳墠骞翠唤 
+
+        // 澶勭悊鏈堜唤
+        let monthArr = DatePickerUtil.loadMonths(1, 12)
+        // 澶勭悊鏃ユ湡
+        let dayArr = DatePickerUtil.loadDays(currentYear, currentMonth, 1)
+        // 澶勭悊hour
+        let hourArr = DatePickerUtil.loadHours(0, 24);
+        // 澶勭悊minute
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+        // 缁欐瘡鍒楄祴鍊煎洖鍘�
+        this.setData({
+          ['multiArray[1]']: monthArr,
+          ['multiArray[2]']: dayArr,
+          ['multiArray[3]']: hourArr,
+          ['multiArray[4]']: minuteArr
+        });
+      }
+    }
+    if (e.detail.column == 1) {//淇敼鏈堜唤鍒�
+      let mon = parseInt(this.data.multiArray[e.detail.column][e.detail.value]); //褰撳墠閫夋嫨鐨勬湀浠�
+      this.setData({
+        month: mon  // 璁板綍褰撳墠鍒�
+      })
+
+      if (mon == currentMonth) {//閫夋嫨鐨勬湀浠�==褰撳墠鏈堜唤 
+        if (this.data.year == currentYear) {
+
+          // 澶勭悊鏃ユ湡
+          let dayArr = DatePickerUtil.loadDays(currentYear, mon, currentDay)
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(currentHour, 24);
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(currentMinute, 60)
+
+          this.setData({
+            ['multiArray[2]']: dayArr,
+            ['multiArray[3]']: hourArr,
+            ['multiArray[4]']: minuteArr
+          })
+        } else {
+          // 澶勭悊鏃ユ湡
+          let dayArr = DatePickerUtil.loadDays(currentYear, mon, 1)
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(0, 24);
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+          this.setData({
+            ['multiArray[2]']: dayArr,
+            ['multiArray[3]']: hourArr,
+            ['multiArray[4]']: minuteArr
+          });
+        }
+      } else {  // 閫夋嫨鐨勬湀浠斤紒=褰撳墠鏈堜唤 
+        // 澶勭悊鏃ユ湡
+        let dayArr = DatePickerUtil.loadDays(currentYear, mon, 1) // 浼犲叆褰撳墠骞翠唤锛屽綋鍓嶉�夋嫨鐨勬湀浠藉幓璁＄畻鏃�
+        // 澶勭悊hour
+        let hourArr = DatePickerUtil.loadHours(0, 24);
+        // 澶勭悊minute
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+        this.setData({
+          ['multiArray[2]']: dayArr,
+          ['multiArray[3]']: hourArr,
+          ['multiArray[4]']: minuteArr
+        });
+      }
+    }
+    if (e.detail.column == 2) {//淇敼鏃�
+      let dd = parseInt(this.data.multiArray[e.detail.column][e.detail.value]);//褰撳墠閫夋嫨鐨勬棩
+      this.setData({
+        day: dd
+      })
+      if (dd == currentDay) {//閫夋嫨鐨勬棩==褰撳墠鏃�
+        if (this.data.year == currentYear && this.data.month == currentMonth) {//閫夋嫨鐨勬槸浠婂ぉ 
+
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(currentHour, 24);
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(currentMinute, 60)
+
+          this.setData({
+            ['multiArray[3]']: hourArr,
+            ['multiArray[4]']: minuteArr
+          });
+
+        } else { //閫夋嫨鐨勪笉鏄粖澶� 
+          // 澶勭悊hour
+          let hourArr = DatePickerUtil.loadHours(0, 24);
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+          this.setData({
+            ['multiArray[3]']: hourArr,
+            ['multiArray[4]']: minuteArr
+          });
+        }
+      } else {  // 閫夋嫨鐨勬棩锛�=褰撳墠鏃� 
+        // 澶勭悊hour
+        let hourArr = DatePickerUtil.loadHours(0, 24);
+        // 澶勭悊minute
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+
+        this.setData({
+          ['multiArray[3]']: hourArr,
+          ['multiArray[4]']: minuteArr
+        });
+      }
+    }
+    if (e.detail.column == 3) {//淇敼鏃�
+      let hh = parseInt(this.data.multiArray[e.detail.column][e.detail.value]); //褰撳墠閫夋嫨鐨勬椂
+      this.setData({
+        hour: hh
+      })
+      if (hh == currentHour) {//閫夋嫨鐨勬椂==褰撳墠鏃� 
+        if (this.data.year == currentYear && this.data.month == currentMonth && this.data.month == currentMonth) {   // 閫夋嫨鐨勬槸浠婂ぉ
+
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(currentMinute, 60)
+          this.setData({
+            ['multiArray[4]']: minuteArr
+          });
+        } else { // 閫夋嫨鐨勪笉鏄粖澶�
+
+          // 澶勭悊minute
+          let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+          this.setData({
+            ['multiArray[4]']: minuteArr
+          });
+        }
+      } else {//閫夋嫨鐨勬椂锛�=褰撳墠鏃� 
+        // 澶勭悊minute
+        let minuteArr = DatePickerUtil.loadMinutes(0, 60)
+        this.setData({
+          ['multiArray[4]']: minuteArr
+        });
+      }
+    }
+    var data = {
+      multiArray: this.data.multiArray,
+      multiIndex: this.data.multiIndex
+    };
+
+    // console.log('淇敼鐨勫垪涓�', e.detail.column, '锛屽�间负', e.detail.value);
+    data.multiIndex[e.detail.column] = e.detail.value; //灏嗗�艰祴鍥炲幓
+
+    this.setData(data);  //灏嗗�艰祴鍥炲幓
+  },
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow: function () {
+
+    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()
+      //杩欓噷鍐欑殑鏄负浜嗚褰曞綋鍓嶆椂闂�
+      let year = parseInt(getCurrentDate.substring(0, 4));
+      let month = parseInt(getCurrentDate.substring(5, 7));
+      let day = parseInt(getCurrentDate.substring(8, 10));
+      let hour = parseInt(getCurrentDate.substring(11, 13));
+      let minute = parseInt(getCurrentDate.substring(14, 16));
+      this.setData({
+        multiArray: loadPickerData,//picker鏁扮粍璧嬪�硷紝鏍煎紡 [years, months, days, hours, minutes]
+        multiIndex: GetMultiIndex,//璁剧疆pickerIndex锛孾0,0,0,0,0]
+        time: getCurrentDate.replace('骞�', '-').replace('鏈�', '-').replace('鏃�', ' '), //璁剧疆褰撳墠鏃堕棿 锛宑urrentYears+'-'+mm+'-'+dd+' '+hh+':'+min
+        year: year,//璁板綍閫夋嫨鐨勫勾
+        month: month,//璁板綍閫夋嫨鐨勬湀
+        day: day,//璁板綍閫夋嫨鐨勬棩
+        hour: hour,//璁板綍閫夋嫨鐨勬椂
+        minute: minute,//璁板綍閫夋嫨鐨勫垎 
+      });
+    }
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/GoldC/pages/yetWX/yetWX.json b/GoldC/pages/yetWX/yetWX.json
new file mode 100644
index 0000000..a3e1b7d
--- /dev/null
+++ b/GoldC/pages/yetWX/yetWX.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-rate": "/miniprogram_npm/vant-weapp/rate/index"
+  },
+  "navigationBarTitleText": "缁翠慨涓嬪崟"
+}
\ No newline at end of file
diff --git a/GoldC/pages/yetWX/yetWX.wxml b/GoldC/pages/yetWX/yetWX.wxml
new file mode 100644
index 0000000..94a806d
--- /dev/null
+++ b/GoldC/pages/yetWX/yetWX.wxml
@@ -0,0 +1,126 @@
+<!--pages/problemReport/proRep.wxml-->
+
+<!-- 璇勫畾椤圭洰 -->
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/pingding.png"></image>
+    <view>璁惧</view>
+  </view>
+  <picker bindchange="bindPicker" value="{{deviceIndex}}" range="{{deviceList2}}" disabled>
+    <view class="chose">{{deviceList2[deviceIndex]?deviceList2[deviceIndex]:'璇烽�夋嫨璁惧'}}</view>
+  </picker>
+</view>
+
+<!-- 鍏徃鍚嶇О -->
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/name.png"></image>
+    <view>缁翠慨宸ヤ汉</view>
+  </view>
+  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled>
+    <view class="chose">{{erectoList2[erectoIndex]?erectoList2[erectoIndex]:'璇烽�夋嫨缁翠慨宸ヤ汉'}}</view>
+  </picker>
+</view>
+
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/gongsixiangmu.png"></image>
+    <view>璁㈠崟鐘舵��</view>
+  </view>
+  <radio-group bindchange="radioChange" style="padding-left: 5%;">
+    <label>
+      <radio value="0" checked="{{form.state==0}}" disabled='{{true}}'>鏈寚娲�</radio>
+    </label>
+    <label>
+      <radio value="1" checked="{{form.state==1}}" disabled='{{true}}'>宸叉淳鍗�</radio>
+    </label>
+    <label>
+      <radio value="2" checked="{{form.state==2}}" disabled='{{true}}'>宸叉帴鍗�</radio>
+    </label>
+    <label>
+      <radio value="3" checked="{{form.state==3}}" disabled='{{true}}'>宸插畬鎴�</radio>
+    </label>
+  </radio-group>
+  <!-- <van-radio-group value="{{ form.state }}"  direction="horizontal">
+    <van-radio name="0">鏈寚娲�</van-radio>
+    <van-radio name="1">宸叉淳鍗�</van-radio>
+    <van-radio name="2">宸叉帴鍗�</van-radio>
+    <van-radio name="3">宸插畬鎴�</van-radio>
+  </van-radio-group> -->
+</view>
+
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛濮撳悕</view>
+  </view>
+  <input bindinput="changeUserName" value="{{form.userName}}" disabled class="textbox"  placeholder="璇疯緭鍏ョ敤鎴峰鍚�"></input>
+</view>
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛鐢佃瘽</view>
+  </view>
+  <input bindinput="changePhone" value="{{form.userPhone}}" disabled class="textbox" placeholder="璇疯緭鍏ョ敤鎴风數璇�"></input>
+</view>
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>缁翠慨鍦板潃</view>
+  </view>
+  <input bindinput="changeaddress" value="{{form.address}}" disabled class="textbox" placeholder="璇疯緭鍏ョ淮淇湴鍧�"></input>
+</view>
+
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/name.png"></image>
+    <view>棰勭害鏃堕棿</view>
+  </view>
+  <view bind:tap="openShowDate" style="padding-left: 3%;">
+    <picker bindtap="clickSelectTime" mode="multiSelector" disabled bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
+      <view style="width: 96%;margin-left: 2%;height: 40px;background: #FFFFFF;line-height: 40px;color: #A18080;padding-left: 3%;">{{time}}</view>
+    </picker>
+  </view>
+</view>
+<!-- 涓婃姤闂 -->
+<view>
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>璁㈠崟澶囨敞</view>
+  </view>
+  <textarea bindinput="changeRemark" disabled class="textbox" value="{{form.description?form.description:view?' ':''}}" placeholder="璇疯緭鍏ヨ鍗曞娉�..."></textarea>
+</view>
+<view wx:if="{{view }}">
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>缁翠慨璇佹槑</view>
+  </view>
+  <image class="upphotoimg" src="{{form.imgUrl}}" mode="aspectFill" style="margin-right:15rpx;width: 350rpx;padding-left: 5%;"></image>
+</view>
+
+<view wx:if="{{form&&!form.isRate}}">
+  <view class="title">
+    <view>瀹㈡埛灏氭湭璇勪环</view>
+  </view>
+</view>
+<view wx:if="{{form&&form.isRate}}">
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛璇勫垎</view>
+  </view>
+  <van-rate readonly value="{{ form.isRate }}" size="{{25}}" color="#EE0A24"  />
+</view>
+<view wx:if="{{form&&form.isRate}}">
+  <view class="title">
+    <image class="primg" src="/images/ProRep/uptext.png"></image>
+    <view>鐢ㄦ埛璇勪环</view>
+  </view>
+  <textarea  disabled class="textbox" value="{{form.evaluate}}" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�..."></textarea>
+</view>
+
+
+<!-- <view class="addressBtn" bindtap="openBaiduMap">鎵撳紑鐧惧害鍦板浘</view> -->
+<!-- footer -->
+
+<!-- 鍗犱綅 -->
+<view style="height:50rpx"></view>
diff --git a/GoldC/pages/yetWX/yetWX.wxss b/GoldC/pages/yetWX/yetWX.wxss
new file mode 100644
index 0000000..49a0f29
--- /dev/null
+++ b/GoldC/pages/yetWX/yetWX.wxss
@@ -0,0 +1,118 @@
+/* pages/problemReport/proRep.wxss */
+.title{
+  width: 90vw;
+  margin: 10rpx auto;
+  font-size: 30rpx;
+  font-weight: 600;
+  padding: 10rpx 0 0rpx 0;
+  display: flex;
+  align-items: center;
+}
+.chose{
+  width: 90vw;
+  height: 90rpx;
+  border: 1rpx solid gainsboro;
+  border-radius: 10rpx;
+  margin: 0 auto;
+  line-height: 90rpx;
+  background-color: white;
+  padding-left: 20rpx;
+  box-sizing: border-box;
+  color: #888;
+}
+.textbox{
+  width: 90vw;
+  height: 90rpx;
+  border: 1rpx solid gainsboro;
+  border-radius: 10rpx;
+  background-color: white;
+  margin: 0 auto;
+  text-indent: 20rpx;
+}
+.photoBox{
+  width: 90vw;
+  margin: 0 auto;
+  color: #888;
+  background-color: white;
+  padding: 20rpx 10rpx;
+  box-sizing: border-box;
+  border-radius: 10rpx;
+}
+.upphotoimg{
+  width: 260rpx;
+  height: 200rpx;
+  /* border: 1rpx solid #999; */
+  border-radius: 10rpx;
+}
+.upimgbox{
+  position: relative;
+}
+.removeimg{
+  height: 50rpx;
+  width: 50rpx;
+  position: absolute;
+  /* top: 0; */
+  right: 15rpx;
+}
+.footer{
+  width: 90vw;
+  display: flex;
+  /* margin-top: 30rpx; */
+  margin: 50rpx auto;
+}
+.btnC{
+  background-color: rgb(209, 209, 209);
+  color: #888;
+  width: 40%!important;
+}
+.van-rate {
+  width: 60%;
+  justify-content: center;
+  display: flex;
+}
+.rateItem{
+  color: #909399;
+}
+.btnY{
+  background-color: #1E90FF;
+  color: whitesmoke;
+  width: 40%!important;
+}
+.primg{
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 10rpx;
+}
+.map{
+  width: 100%;
+  height: 350rpx;
+  border-radius: 5rpx;
+  margin-top: 20rpx;
+  border: 1rpx solid ghostwhite;
+  display: none;
+}
+.address{
+  width: 100%;
+  height: 90rpx;
+  border: 1rpx solid gainsboro;
+  border-radius: 10rpx;
+  margin: 0 auto;
+  line-height: 90rpx;
+  background-color: white;
+  padding-left: 20rpx;
+  box-sizing: border-box;
+  color: #888;
+}
+.addressBtn{
+  border: 1rpx solid gainsboro;
+  width: 200rpx;
+  /* height: 50rpx; */
+  padding: 3rpx;
+  text-align: center;
+  border-radius: 15rpx;
+  margin-top: 10rpx;
+}
+.addresstit{
+  margin-bottom: 5rpx;
+  color: #555;
+}
\ No newline at end of file

--
Gitblit v1.8.0