hailu
2023-11-27 0ad28dbac74ba51b604c31c2dee7494d4e7f8fe4
安装流程
13个文件已修改
4个文件已添加
818 ■■■■ 已修改文件
GoldC/app.json 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/Remind/Remind.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/devicelogs/devicelogs.js 121 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/devicelogs/devicelogs.json 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/devicelogs/devicelogs.wxml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/devicelogs/devicelogs.wxss 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/home/home.js 68 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/login/login.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/maintenance/maintenance.wxml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/person/person.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/problemList/problemList.js 159 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/problemList/problemList.wxml 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/problemListT3/ProblemListT3.wxml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/problemReport/proRep.js 256 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/problemReport/proRep.wxml 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/xiangqing/xiangqing.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/project.config.json 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/app.json
@@ -15,12 +15,16 @@
    "pages/fixpwd/fixpwd",
    "pages/xiangqing/xiangqing",
    "pages/baidumap/bmap",
    "pages/maintenance/maintenance"
    "pages/maintenance/maintenance",
    "pages/devicelogs/devicelogs"
  ],
  "permission": {
    "scope.userLocation": {
      "desc": "你的位置信息将用于小程序位置接口的效果展示"
    }
  },
  "requiredPrivateInfos": [
  "requiredPrivateInfos": [
    "chooseLocation"
  ],
  "window": {
    "backgroundTextStyle": "light",
@@ -29,11 +33,12 @@
    "navigationBarTextStyle": "black",
    "enablePullDownRefresh": false
  },
  "tabBar": {
    "color": "#8a8a8a",
    "selectedColor": "#1296db",
    "list": [
      {
    "list": [{
        "pagePath": "pages/home/home",
        "text": "首页",
        "iconPath": "/images/home(1).png",
@@ -47,6 +52,12 @@
      }
    ]
  },
  "plugins": {
    "routePlan": {
      "version": "1.0.19",
      "provider": "wx50b5593e81dd937a"
    }
  },
  "style": "v2",
  "sitemapLocation": "sitemap.json"
}
GoldC/pages/Remind/Remind.wxml
@@ -59,7 +59,7 @@
                <view class="body">
                    <view class="h2txt"><image class="primg" src="/images/ProRep/pingding.png"></image>评定项目:</view>
                    <view class="text">{{item.ManagementName}}</view>
                    <view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>问题描述:</view>
                    <view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>订单详情:</view>
                    <view class="text">{{item.Reported_Question}}</view>
                    <!-- <view class="h2txt">问题图片:</view>     -->
                    <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view>
@@ -124,7 +124,7 @@
                <view class="body">
                    <view class="h2txt">问题分类:</view>
                    <view class="text">{{item.ManagementName}}</view>
                    <view class="h2txt">问题描述:</view>
                    <view class="h2txt">订单详情:</view>
                    <view class="text">{{item.Reported_Question}}</view>
                    <!-- <view class="h2txt">问题图片:</view>     -->
                    <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view>
GoldC/pages/devicelogs/devicelogs.js
New file
@@ -0,0 +1,121 @@
// pages/repair/repair.js
Page({
  /**
   * 页面的初始数据
   */
  data: {
    deviceInfo: {},
    deviceDetail: {},
    marker: []
  },
  /**
   * 生命周期函数--监听页面加载
   */
  onLoad(options) {
    this.setData({
      deviceDetail:JSON.parse(options.address)
    })
    console.log(this.data.deviceDetail);
    var marker = [{
      id:0,
      latitude: this.data.deviceDetail.lat,
      longitude: this.data.deviceDetail.lng,
      iconPath: '../../images/ProRep/weizhi.png',
      width: '50rpx',
      height: "50rpx",
      callout: {
        color: '#000000',
        content: this.data.deviceDetail.name,
        fontSize: 12,
        borderRadius: 5,
        bgColor: '#ffffff',
        padding: 10,
        textAlign: 'center',
        display: "ALWAYS"
        // anchorY:-18
      }
    }]
    this.setData({
      marker: marker
    })
    // let address = JSON.parse(options.address)
    // console.log(address);
    // this.setData({
    //   deviceInfo: deviceInfo
    // })
    // wx.setNavigationBarTitle({
    //   title: deviceInfo.deviceName //页面切换,更换页面标题
    // })
    // this.getDeviceInfo()
  },
  goMap() {
    let plugin = requirePlugin('routePlan');
    let key = 'SRGBZ-FLCKU-2TIVH-BFHUM-D5CTO-LFBHQ';  //使用在腾讯位置服务申请的key
    let referer = '高德地图';   //调用插件的app的名称
    let endPoint = JSON.stringify({  //终点
      'name': this.data.deviceDetail.address,
      'latitude': this.data.deviceDetail.lat,
      'longitude': this.data.deviceDetail.lng
    });
    console.log(endPoint);
    wx.navigateTo({
      url: 'plugin://routePlan/index?key=' + key + '&referer=' + referer + '&endPoint=' + endPoint
    });
  },
  /**
   * 生命周期函数--监听页面初次渲染完成
   */
  onReady() {
  },
  /**
   * 生命周期函数--监听页面显示
   */
  onShow() {
  },
  /**
   * 生命周期函数--监听页面隐藏
   */
  onHide() {
  },
  /**
   * 生命周期函数--监听页面卸载
   */
  onUnload() {
  },
  /**
   * 页面相关事件处理函数--监听用户下拉动作
   */
  onPullDownRefresh() {
  },
  /**
   * 页面上拉触底事件的处理函数
   */
  onReachBottom() {
  },
  /**
   * 用户点击右上角分享
   */
  onShareAppMessage() {
  }
})
GoldC/pages/devicelogs/devicelogs.json
New file
@@ -0,0 +1,7 @@
{
  "usingComponents": {
  },
  "navigationBarTitleText": "设备日志",
  "navigationBarTextStyle": "white",
  "navigationBarBackgroundColor": "#007CFE"
}
GoldC/pages/devicelogs/devicelogs.wxml
New file
@@ -0,0 +1,10 @@
<view class="title">
  <image class="primg" src="/images/ProRep/weizhi.png"></image>
  地图定位:
</view>
<view class="map">
  <map style="width:100%;height:100%" latitude="{{deviceDetail.lat}}" longitude="{{deviceDetail.lng}}" markers="{{marker}}"></map>
</view>
<view bind:tap="goMap" style=" background-color: #1E90FF;color: white;width: 94%;text-align: center;height: 40px;line-height: 40px;margin-left:3% ;margin-top: 20px;border-radius: 5px;">
  地图导航
</view>
GoldC/pages/devicelogs/devicelogs.wxss
New file
@@ -0,0 +1,15 @@
.title{
  color: #000000;
  font-size: 30rpx;
  margin-top: 15rpx;
  font-weight: 700;
}
.map{
  width: 100%;
  height: 450rpx;
}
.primg{
  width: 30rpx;
  height: 30rpx;
  margin-right: 10rpx;
}
GoldC/pages/home/home.js
@@ -9,8 +9,8 @@
  data: {
    showone: false,
    showtwo: false,
    newsnum:0,
    roleKey:'',
    newsnum: 0,
    roleKey: false,
  },
  // 跳转到问题列表 (管理员)
  toProblemList() {
@@ -18,7 +18,7 @@
      url: '/pages/problemList/problemList',
    })
  },
  toMaintenanceList(){
  toMaintenanceList() {
    wx.navigateTo({
      url: '/pages/maintenance/maintenance',
    })
@@ -33,8 +33,11 @@
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {
    // console.log(options);
    var user = wx.getStorageSync('user')
    console.log(this.data.roleKey);
    switch (user.RoleValue) {
      case 1:
        this.setData({
@@ -42,10 +45,10 @@
        })
        break;
      case 3:
          this.setData({
            showone: true
          })
          break;
        this.setData({
          showone: true
        })
        break;
      case 6:
        this.setData({
          showone: true
@@ -81,17 +84,44 @@
  onReady: function () {
  },
  getInfo() {
    wx.request({
      url: 'https://puyue.yhupai.com/prod-api/getInfo',
      method: "GET",
      header: {
        "Access-Control-Allow-Headers": 'token',
        Authorization: `Bearer ${wx.getStorageSync('token')}`
      },
      success: (res, header) => {
        if (res.data.code != 200) {
          wx.showToast({
            title: res.data.msg,
            icon: 'none'
          });
        } else {
          // let data = JSON.parse(JSON.stringify(res.data))
          // let erectoId = data.user.userId
          console.log(res.data.user.userId);
          wx.setStorageSync('userInfo', res.data)
          wx.setStorageSync('roleKey', res.data.user.roles[0].roleKey)
          wx.setStorageSync('nickName',res.data.user.nickName)
          this.setData({
            roleKey:res.data.user.roles[0].roleKey
          })
          wx.setStorageSync('deptId', res.data.user.dept.deptId)
          wx.setStorageSync('erectoId', res.data.user.userId)
          // console.log(wx.getStorageInfoSync('erectoId'));
        }
      }
    })
  },
  /**
   * 生命周期函数--监听页面显示
   */
  onShow: function () {
    this.setData({
      roleKey:wx.getStorageSync('roleKey')
    })
    var user = wx.getStorageSync('user')
    this.getInfo()
    switch (user.RoleValue) {
      case 1:
        this.setData({
@@ -100,11 +130,11 @@
        })
        break;
      case 3:
          this.setData({
            showone: true,
            showtwo: false
          })
          break;
        this.setData({
          showone: true,
          showtwo: false
        })
        break;
      case 6:
        this.setData({
          showone: true,
@@ -124,7 +154,7 @@
        })
        break;
    }
  },
  /**
GoldC/pages/login/login.js
@@ -68,7 +68,7 @@
          title: '登录成功!',
          icon: 'none'
        });
        this.getInfo()
        // this.getInfo()
        app.setUser(res.data)
        wx.hideLoading({
          success: (res) => {
GoldC/pages/maintenance/maintenance.wxml
@@ -34,7 +34,7 @@
                    <view class="text">{{item.ManagementName}}</view>
                    <view class="h2txt">
                        <image class="primg" src="/images/ProRep/uptext.png"></image>
                    问题描述:</view>
                    订单详情:</view>
                    <view class="text">{{item.Reported_Question}}</view>
                    <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view>
                    <!-- <view class="h2txt">问题图片:</view> -->
@@ -91,7 +91,7 @@
                    <view class="text">{{item.ManagementName}}</view>
                    <view class="h2txt">
                    <image class="primg" src="/images/ProRep/uptext.png"></image>
                    问题描述:</view>
                    订单详情:</view>
                    <view class="text">{{item.Reported_Question}}</view>
                    <!-- <view class="h2txt">问题图片:</view> -->
                    <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view>
@@ -142,7 +142,7 @@
                    <view class="text">{{item.ManagementName}}</view>
                    <view class="h2txt">
                    <image class="primg" src="/images/ProRep/uptext.png"></image>
                    问题描述:</view>
                    订单详情:</view>
                    <view class="text">{{item.Reported_Question}}</view>
                    <!-- <view class="h2txt">问题图片:</view> -->
                    <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view>
GoldC/pages/person/person.js
@@ -99,7 +99,7 @@
          })
          if(res.data.data.avatar){
            this.setData({
              imgHeader:'https://puyue.yhupai.com/prod-api/'+res.data.data.avatar
              imgHeader:'https://puyue.yhupai.com/prod-api'+res.data.data.avatar
            })
          }
        }
GoldC/pages/problemList/problemList.js
@@ -22,12 +22,12 @@
    show: false,
    text: '',
    itemId: '',
    modalHidden: true,
    delModal: true,
    // currentIndex:1,
    // totalPage:0,
    index: 1,
    total: 10,
    pageMask: false,
    prevBtnDis: true,
    nextBtnDis: false,
@@ -40,6 +40,10 @@
        type: Number
      }
    },
    form: {
    },
    nickName:'',
  },
  lifetimes: {
    // 在组件实例进入页面节点树时执行
@@ -63,6 +67,8 @@
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {
  },
  // 设置异步请求之后的页面、总记录数
  setPage(index, total) {
@@ -140,6 +146,7 @@
    this.setData({
      state: e.detail.index,
      active1: e.detail.index,
      nickName:wx.getStorageSync('nickName')
    })
    this.getList()
  },
@@ -206,8 +213,8 @@
          this.setData({
            listdata: data.rows,
            total: total,
            showPage:true,
            showNull:false
            showPage: true,
            showNull: false
          })
          console.log(this.data.listdata)
          wx.hideLoading()
@@ -216,8 +223,8 @@
          this.setData({
            listdata: [],
            total: 0,
            showPage:false,
            showNull:true
            showPage: false,
            showNull: true
          })
          wx.hideLoading()
        }
@@ -272,16 +279,149 @@
    // wx.showLoading({
    //   title: '加载中',
    // })
    this.setData({
      nickName:wx.getStorageSync('nickName')
    })
    this.getErectoListLevel()
    this.getList()
  },
  statements(e){
  edit(e) {
    console.log(e);
    var item=e.currentTarget.dataset.base
    var item = e.currentTarget.dataset.base
    wx.navigateTo({
      url: '/pages/problemReport/proRep?info='+JSON.stringify(item),
      url: '/pages/problemReport/proRep?info=' + JSON.stringify(item),
    })
  },
  statements(e) {
    console.log(e);
    let item = JSON.parse(JSON.stringify(e.currentTarget.dataset.base))
    console.log(item);
    item.state = 3
    console.log(item);
    wx.navigateTo({
      url: '/pages/problemReport/proRep?info=' + JSON.stringify(item),
    })
  },
  goAddress(e) {
    var address = e.currentTarget.dataset.base.address
    console.log(e.currentTarget.dataset);
    wx.request({
      url: 'https://apis.map.qq.com/ws/geocoder/v1/',
      data: {
        address: address,
        key: 'SRGBZ-FLCKU-2TIVH-BFHUM-D5CTO-LFBHQ'
      },
      success: function (res) {
        console.log(res.data.result.location);  // 打印出经纬度
        let params = res.data.result.location
        params.name = e.currentTarget.dataset.base.userName
        params.address = e.currentTarget.dataset.base.address
        console.log(params);
        wx.navigateTo({
          url: '/pages/devicelogs/devicelogs?address=' + JSON.stringify(params),
        })
      }
    });
  },
  jd(e) {
    var item = e.currentTarget.dataset.base
    this.setData({
      modalHidden: false,
      form: item
    })
  },
  getreceiveTime() {
    let date = new Date();
    let year = date.getFullYear();
    let month = date.getMonth() + 1;
    let day = date.getDate();
    let hour = date.getHours();
    let minute = date.getMinutes();
    let second = date.getSeconds();
    return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day} ${hour < 10 ? '0' + hour : hour}:${minute < 10 ? '0' + minute : minute}:${second < 10 ? '0' + second : second}`;
  },
  modalChange() {
    this.data.form.state = 2
    let data = this.data.form
    data.id = this.data.form.id
    data.receiveTime=this.getreceiveTime()
    // console.log(this.data.form);
    // return
    // data.receiveTime=this.getreceiveTime()
      wx.request({
        url: 'https://puyue.yhupai.com/prod-api/iot/deviceOrder',
        method: "PUT",
        header: {
          "Access-Control-Allow-Headers": 'token',
          Authorization: `Bearer ${wx.getStorageSync('token')}`
        },
        data: data,
        success: (res, header) => {
          if (res.data.code == 200) {
            this.setData({
              index: 1,
              modalHidden: true
            })
            this.getList()
          } else {
            this.setData({
              index: 1,
              modalHidden: true
            })
            this.getList()
          }
        }
      })
  },
  modalCancel() {
    this.setData({
      modalHidden: true
    })
  },
  delAZ(e) {
    console.log(e);
    var item = e.currentTarget.dataset.base
    this.setData({
      delModal: false,
      form: item
    })
  },
  DelChange() {
    wx.request({
      url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder/${this.data.form.id}`,
      method: "DELETE",
      header: {
        "Access-Control-Allow-Headers": 'token',
        Authorization: `Bearer ${wx.getStorageSync('token')}`
      },
      success: (res, header) => {
        if (res.data.code == 200) {
          this.setData({
            index: 1,
            delModal: true
          })
          this.getList()
        } else {
          this.setData({
            index: 1,
            delModal: true
          })
          this.getList()
        }
      }
    })
  },
  DelCancel() {
    this.setData({
      delModal: true
    })
  },
  /**
@@ -295,7 +435,6 @@
   * 生命周期函数--监听页面卸载
   */
  onUnload: function () {
    // console.log(111111111)
    wx.switchTab({
      url: '/pages/home/home',
    })
GoldC/pages/problemList/problemList.wxml
@@ -33,7 +33,7 @@
  <!-- 已上报 -->
  <van-tab title="未派单">
    <view class="listBox">
      <view class="list" wx:for="{{listdata}}">
      <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
        <view class="heard">
          <view class="htext">{{item.device.deviceName}}</view>
        </view>
@@ -46,7 +46,7 @@
          <view class="text">用户电话:{{item.userPhone}}</view>
          <view class="h2txt">
            <image class="primg" src="/images/ProRep/uptext.png"></image>
            问题描述:
            订单详情:
          </view>
          <view class="text">{{item.remark?item.remark:'--'}}</view>
          <!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view> -->
@@ -57,7 +57,7 @@
          <!--  -->
          <!--  -->
          <view class="address">
          <view class="address" data-base='{{item}}' bind:tap="goAddress">
            <image class="timeicon" src="/images/address.png"></image>
            <text>{{item.address}}</text>
          </view>
@@ -69,15 +69,16 @@
        <view class="footer">
          <view class="libtn">
            <!-- 修改 -->
            <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}">
            <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="edit">
              <van-icon name="edit" class="icon" />
              <text>修改</text>
            </view>
          </view>
          <view class="libtn">
            <!-- 删除 -->
            <view class="btn btn-del" bindtap="del" data-id="{{item.pk_Examine}}" wx:if="{{roleKey!=='tenantservice'}}">
              <van-icon name="delete" class="icon" /><text>删除</text>
            <view class="btn btn-del" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="delAZ">
              <van-icon name="delete" class="icon" />
              <text>删除</text>
            </view>
          </view>
        </view>
@@ -87,7 +88,7 @@
  <!-- 处理中 -->
  <van-tab title="已派单">
    <view class="listBox">
      <view class="list" wx:for="{{listdata}}">
      <view class="list" wx:for="{{listdata}}" wx:for-item="item">
        <view class="heard">
          <view class="htext">{{item.device.deviceName}}</view>
        </view>
@@ -100,18 +101,10 @@
          <view class="text">用户电话:{{item.userPhone}}</view>
          <view class="h2txt">
            <image class="primg" src="/images/ProRep/uptext.png"></image>
            问题描述:
            订单详情:
          </view>
          <view class="text">{{item.remark?item.remark:'--'}}</view>
          <!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view> -->
          <!-- <view class="h2txt">问题图片:</view> -->
          <!-- <view style="padding-left: 30rpx;">
            <image wx:for="{{item.Reported_ImgArray}}" wx:for-item="imgitem" class="quImg" style="{{item.loading?'display:block':'display:none'}}" bindload="imgOnLoad" data-index="{{index}}" data-imgindex="{{imgitem}}" mode="aspectFill" src="{{'http://47.92.31.84:8088'+ imgitem}}" bindtap="imgYu" data-img="{{'http://47.92.31.84:8088'+ imgitem}}"></image>
          </view> -->
          <!--  -->
          <!--  -->
          <view class="address">
          <view class="address" data-base='{{item}}' bind:tap="goAddress">
            <image class="timeicon" src="/images/address.png"></image>
            <text>{{item.address}}</text>
          </view>
@@ -123,15 +116,15 @@
        <view class="footer">
          <view class="libtn">
            <!-- 修改 -->
            <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}">
            <view class="btn btn-adit" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="edit">
              <van-icon name="edit" class="icon" />
              <text>修改</text>
            </view>
          </view>
          <view class="libtn">
            <!-- 删除 -->
            <view class="btn btn-del" bindtap="del" data-id="{{item.pk_Examine}}" wx:if="{{roleKey!=='tenantservice'}}">
              <van-icon name="delete" class="icon" /><text>删除</text>
          <view class="libtn" wx:if="{{item.erectoName==nickName}}">
            <view class="btn btn-adit" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="jd">
              <van-icon name="edit" class="icon" />
              <text>接单</text>
            </view>
          </view>
        </view>
@@ -141,7 +134,7 @@
  <!-- 待审核 -->
  <van-tab title="已接单">
    <view class="listBox">
      <view class="list" wx:for="{{listdata}}"  wx:for-item='item'>
      <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
        <view class="heard">
          <view class="htext">{{item.device.deviceName}}</view>
        </view>
@@ -154,18 +147,10 @@
          <view class="text">用户电话:{{item.userPhone}}</view>
          <view class="h2txt">
            <image class="primg" src="/images/ProRep/uptext.png"></image>
            问题描述:
            订单详情:
          </view>
          <view class="text">{{item.remark?item.remark:'--'}}</view>
          <!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view> -->
          <!-- <view class="h2txt">问题图片:</view> -->
          <!-- <view style="padding-left: 30rpx;">
            <image wx:for="{{item.Reported_ImgArray}}" wx:for-item="imgitem" class="quImg" style="{{item.loading?'display:block':'display:none'}}" bindload="imgOnLoad" data-index="{{index}}" data-imgindex="{{imgitem}}" mode="aspectFill" src="{{'http://47.92.31.84:8088'+ imgitem}}" bindtap="imgYu" data-img="{{'http://47.92.31.84:8088'+ imgitem}}"></image>
          </view> -->
          <!--  -->
          <!--  -->
          <view class="address">
          <view class="address" data-base='{{item}}' bind:tap="goAddress">
            <image class="timeicon" src="/images/address.png"></image>
            <text>{{item.address}}</text>
          </view>
@@ -177,15 +162,9 @@
        <view class="footer">
          <view class="libtn">
            <!-- 修改 -->
            <view class="btn btn-adit"  data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="statements">
            <view class="btn btn-adit" data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="statements">
              <van-icon name="edit" class="icon" />
              <text>结单</text>
            </view>
          </view>
          <view class="libtn">
            <!-- 删除 -->
            <view class="btn btn-del" bindtap="del" data-id="{{item.pk_Examine}}" wx:if="{{roleKey!=='tenantservice'}}">
              <van-icon name="delete" class="icon" /><text>删除</text>
            </view>
          </view>
        </view>
@@ -208,7 +187,7 @@
          <view class="text">用户电话:{{item.userPhone}}</view>
          <view class="h2txt">
            <image class="primg" src="/images/ProRep/uptext.png"></image>
            问题描述:
            订单详情:
          </view>
          <view class="text">{{item.remark?item.remark:'--'}}</view>
          <!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view> -->
@@ -219,7 +198,8 @@
          <!--  -->
          <!--  -->
          <view class="address">
          <view class="address" data-base='{{item}}' bind:tap="goAddress">
            <image class="timeicon" src="/images/address.png"></image>
            <text>{{item.address}}</text>
          </view>
@@ -234,12 +214,6 @@
            <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}">
              <van-icon name="edit" class="icon" />
              <text>修改</text>
            </view>
          </view>
          <view class="libtn">
            <!-- 删除 -->
            <view class="btn btn-del" bindtap="del" data-id="{{item.pk_Examine}}" wx:if="{{roleKey!=='tenantservice'}}">
              <van-icon name="delete" class="icon" /><text>删除</text>
            </view>
          </view>
        </view>
@@ -267,4 +241,11 @@
      </view>
    </view>
  </view>
</view>
</view>
<modal title="接单" confirm-text="确认" cancel-text="取消" hidden="{{modalHidden}}" bindconfirm="modalChange" bindcancel="modalCancel">
  是否确认接单?此操作不可恢复!
</modal>
<modal title="删除订单" confirm-text="确认" cancel-text="取消" hidden="{{delModal}}" bindconfirm="DelChange" bindcancel="DelCancel">
  是否删除此订单?此操作不可恢复!
</modal>
GoldC/pages/problemListT3/ProblemListT3.wxml
@@ -52,7 +52,7 @@
                <view class="body">
                    <view class="h2txt"><image class="primg" src="/images/ProRep/pingding.png"></image>评定项目:</view>
                    <view class="text">{{item.ManagementName}}</view>
                    <view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>问题描述:</view>
                    <view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>订单详情:</view>
                    <view class="text">{{item.Reported_Question}}</view>
                    <!-- <view class="h2txt">问题图片:</view>     -->
                    <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view>
@@ -109,7 +109,7 @@
                <view class="body">
                    <view class="h2txt"><image class="primg" src="/images/ProRep/pingding.png"></image>评定项目:</view>
                    <view class="text">{{item.ManagementName}}</view>
                    <view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>问题描述:</view>
                    <view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>订单详情:</view>
                    <view class="text">{{item.Reported_Question}}</view>
                    <!-- <view class="h2txt">问题图片:</view>     -->
                    <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view>
@@ -160,7 +160,7 @@
                <view class="body">
                    <view class="h2txt"><image class="primg" src="/images/ProRep/pingding.png"></image>评定项目:</view>
                    <view class="text">{{item.ManagementName}}</view>
                    <view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>问题描述:</view>
                    <view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>订单详情:</view>
                    <view class="text">{{item.Reported_Question}}</view>
                    <!-- <view class="h2txt">问题图片:</view>     -->
                    <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view>
@@ -202,7 +202,7 @@
                <view class="body">
                    <view class="h2txt"><image class="primg" src="/images/ProRep/pingding.png"></image>评定项目:</view>
                    <view class="text">{{item.ManagementName}}</view>
                    <view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>问题描述:</view>
                    <view class="h2txt"><image class="primg" src="/images/ProRep/uptext.png"></image>订单详情:</view>
                    <view class="text">{{item.Reported_Question}}</view>
                    <!-- <view class="h2txt">问题图片:</view>     -->
                        <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view>
GoldC/pages/problemReport/proRep.js
@@ -27,6 +27,7 @@
    erectoList2: [],
    deviceList1: [],
    deviceList2: [],
    imgUrl: '/images/img.png',
    time: '选择预约时间',
    multiArray: [],//piker的item项
@@ -45,9 +46,10 @@
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {
    if (options) {
    if (options && options.info) {
      let info = JSON.parse(options.info)
      info.state = 3
      console.log(info);
      this.setData({
        showJD: true,
        paramsInfo: info,
@@ -59,16 +61,200 @@
        erectoList2: [info.erectoName]
      })
      wx.setNavigationBarTitle({
        title:this.data.form.device.deviceName
        title: this.data.form.device.deviceName
      })
      console.log(this.data);
    } else {
      this.getErectoList()
      this.getDeviceList()
    }
  },
  changeUserName(e) {
    this.data.form.userName = e.detail.value
  },
  changePhone(e) {
    this.data.form.userPhone = e.detail.value
  },
  changeaddress(e) {
    this.data.form.address = e.detail.value
  },
  changeRemark(e) {
    this.data.form.remark = e.detail.value
  },
  Cancel() {
    wx.navigateBack()
  },
  Yes() {
    console.log(this.data.form);
    if (this.data.form.state == 3) {
      if (!this.data.form.imgUrl) {
        wx.showToast({
          title: '请上传图片',
          icon: 'none'
        });
        return
      }
      this.data.form.orderType='1'
      console.log(this.data.form);
      wx.request({
        url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder`,
        method: "put",
        header: {
          "Access-Control-Allow-Headers": 'token',
          Authorization: `Bearer ${wx.getStorageSync('token')}`
        },
        data: this.data.form,
        success: (res, header) => {
          if (res.data.code != 200) {
            wx.showToast({
              title: res.data.msg,
              icon: 'none'
            });
          } else {
            wx.navigateBack()
          }
        }
      })
    } else if (Object.keys(this.data.paramsInfo).length > 0 && this.data.form.state != 3) {
      console.log(this.data.form);
      let phoneReg = /^1[3456789]\d{9}$/;
      if (!this.data.form.userName) {
        wx.showToast({
          title: '请输入用户名',
          icon: 'none'
        })
        return
      } else if (!phoneReg.test(this.data.form.userPhone)) {
        wx.showToast({
          title: '请输入正确手机号',
          icon: 'none'
        })
        return
      } else if (!this.data.form.address) {
        wx.showToast({
          title: '请输入安装地址',
          icon: 'none'
        })
        return
      }
      wx.request({
        url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder`,
        method: "put",
        header: {
          "Access-Control-Allow-Headers": 'token',
          Authorization: `Bearer ${wx.getStorageSync('token')}`
        },
        data: this.data.form,
        success: (res, header) => {
          if (res.data.code != 200) {
            wx.showToast({
              title: res.data.msg,
              icon: 'none'
            });
          } else {
            wx.navigateBack()
          }
        }
      })
    } else {
      console.log(this.data.form);
      let phoneReg = /^1[3456789]\d{9}$/;
      if (!this.data.form.userName) {
        wx.showToast({
          title: '请输入用户名',
          icon: 'none'
        })
        return
      } else if (!phoneReg.test(this.data.form.userPhone)) {
        wx.showToast({
          title: '请输入正确手机号',
          icon: 'none'
        })
        return
      } else if (!this.data.form.address) {
        wx.showToast({
          title: '请输入安装地址',
          icon: 'none'
        })
        return
      }
      wx.request({
        url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder`,
        method: "post",
        header: {
          "Access-Control-Allow-Headers": 'token',
          Authorization: `Bearer ${wx.getStorageSync('token')}`
        },
        data: this.data.form,
        success: (res, header) => {
          console.log(res);
          if (res.data.code != 200) {
            wx.showToast({
              title: res.data.msg,
              icon: 'none'
            });
          } else {
            wx.navigateTo({
              url: '/pages/problemList/problemList',
            })
          }
        }
      })
    }
  },
  chooseimage() {
    var that = this; // 将当前页面的上下文赋值给 that 变量
    // 在某个事件处理函数中调用以下代码
    wx.chooseImage({
      count: 1, // 最多可以选择的图片数量,这里设为1
      sourceType: ['album'], // 从相册选择
      success: function (res) {
        // 选择成功后,res.tempFilePaths 是选定的图片的本地文件路径列表
        const tempFilePath = res.tempFilePaths;
        wx.compressImage({
          src: tempFilePath[0],
          quality: 80, // 设置压缩质量,范围为 0-100
          success: function (res) {
            const compressedFilePath = res.tempFilePath;
            console.log(compressedFilePath, 'compressedFilePath');
            // 压缩后的图片路径进行的后续操作
            try {
              let data = compressedFilePath
              wx.uploadFile({
                // 上传接口路径
                url: `https://puyue.yhupai.com/prod-api/iot/deviceOrder/profile/avatar`,
                filePath: data,
                name: 'avatarfile', // 上传文件对应的 key 名称
                method: 'post',
                header: {
                  'content-type': 'application/form-data',
                  "Access-Control-Allow-Headers": 'token',
                  Authorization: `Bearer ${wx.getStorageSync('token')}`
                },
                // data: data
                success: function (res) {
                  console.log(res.data);
                  // 上传成功后的处理逻辑
                  that.setData({
                    imgUrl: 'https://puyue.yhupai.com/prod-api' + JSON.parse(res.data).imgUrl // 将选择的图片路径设置为页面数据的某个属性
                  });
                  console.log(that.data.imgUrl);
                  that.data.form.imgUrl = that.data.imgUrl
                },
                fail: function (res) {
                  // 上传失败后的处理逻辑
                  console.log(res, '上传失败后的处理逻辑');
                }
              })
            } catch (e) { }
          },
          fail: function (err) {
            // 压缩失败的处理
            console.error(err);
          }
        });
      }
    });
  },
  getDeviceList() {
    let data = {
@@ -97,6 +283,8 @@
            deviceList1: res.data.rows,
            deviceList2: data
          })
          this.data.form.deviceId = res.data.rows[0].deviceId
          this.data.form.deviceName = res.data.rows[0].deviceName
        }
      }
    })
@@ -117,7 +305,6 @@
      },
      params: data,
      success: (res, header) => {
        if (res.data.code != 200) {
          wx.showToast({
            title: res.data.msg,
@@ -136,21 +323,47 @@
            erectoList2: data
          })
          this.data.form.erectoId = -1
          this.data.form.erectoName = '未指派'
        }
      }
    })
  },
  bindPicker(e) {
    // console.log('picker发送选择改变,携带值为', e.detail.value)
    console.log('picker发送选择改变,携带值为', e.detail.value)
    this.setData({
      deviceIndex: e.detail.value
    })
    this.data.form.deviceId = this.data.deviceList1[e.detail.value].deviceId
    this.data.form.deviceName = this.data.deviceList1[e.detail.value].deviceName
    console.log(this.data.form, this.data.deviceList1);
  },
  bindPicker2(e) {
    // console.log('picker发送选择改变,携带值为', e.detail.value)
    this.setData({
      erectoIndex: e.detail.value
    })
    if (this.data.erectoIndex == 0) {
      let item = JSON.parse(JSON.stringify(this.data.form))
      item.state = 0
      this.setData({
        form: item
      })
      // this.data.form.state = 0
      this.data.form.erectoId = -1
      this.data.form.erectoName = '未指派'
    } else {
      let item = JSON.parse(JSON.stringify(this.data.form))
      item.state = 1
      this.setData({
        form: item
      })
      // this.data.form.state = 1
      this.data.form.erectoId = this.data.erectoList1[Number(e.detail.value)].userId
      this.data.form.erectoName = this.data.erectoList1[Number(e.detail.value)].nickName
    }
    console.log(this.data.erectoList1, this.data.erectoList2, e.detail.value, this.data.form);
  },
  openShowDate() {
    this.setData({
@@ -178,7 +391,7 @@
      hour: hour, //记录选择的时
      minute: minute, //记录选择的分 
    })
    console.log(this.data.time);
    this.data.form.appointmentTime = this.data.time
  },
  bindMultiPickerColumnChange: function (e) { //监听picker的滚动事件
@@ -369,7 +582,28 @@
   * 生命周期函数--监听页面显示
   */
  onShow: function () {
    if (!this.data.showJD) {
    if (this.data.form && this.data.form.appointmentTime) {
      var loadPickerData = DatePickerUtil.loadPickerData()
      // var getCurrentDate = DatePickerUtil.getCurrentDate()
      var GetMultiIndex = DatePickerUtil.GetMultiIndex()
      //这里写的是为了记录当前时间
      let year = parseInt(this.data.form.appointmentTime.substring(0, 4));
      let month = parseInt(this.data.form.appointmentTime.substring(5, 7));
      let day = parseInt(this.data.form.appointmentTime.substring(8, 10));
      let hour = parseInt(this.data.form.appointmentTime.substring(11, 13));
      let minute = parseInt(this.data.form.appointmentTime.substring(14, 16));
      this.setData({
        multiArray: loadPickerData,//picker数组赋值,格式 [years, months, days, hours, minutes]
        multiIndex: GetMultiIndex,//设置pickerIndex,[0,0,0,0,0]
        time: year + '-' + month + '-' + day + ' ' + hour + '-' + minute, //设置当前时间 ,currentYears+'-'+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()
GoldC/pages/problemReport/proRep.wxml
@@ -6,7 +6,7 @@
    <image class="primg" src="/images/ProRep/pingding.png"></image>
    <view>设备</view>
  </view>
  <picker bindchange="bindPicker" value="{{deviceIndex}}" range="{{deviceList2}}" disabled='{{showJD}}'>
  <picker bindchange="bindPicker" value="{{deviceIndex}}" range="{{deviceList2}}" disabled='{{showJD&&form.state>0}}'>
    <view class="chose">{{deviceList2[deviceIndex]?deviceList2[deviceIndex]:'请选择设备'}}</view>
  </picker>
</view>
@@ -17,7 +17,7 @@
    <image class="primg" src="/images/ProRep/name.png"></image>
    <view>安装工</view>
  </view>
  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled='{{showJD}}'>
  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled='{{showJD&&form.state>0}}'>
    <view class="chose">{{erectoList2[erectoIndex]?erectoList2[erectoIndex]:'请选择安装工'}}</view>
  </picker>
</view>
@@ -27,20 +27,20 @@
    <image class="primg" src="/images/ProRep/gongsixiangmu.png"></image>
    <view>状态</view>
  </view>
  <!-- <radio-group bindchange="radioChange"> -->
  <radio-group bindchange="radioChange">
    <label>
      <radio value="0" checked="{{form.state==0}}" disabled='{{showJD}}'>未指派</radio>
      <radio value="0" checked="{{form.state==0}}" disabled='{{true}}'>未指派</radio>
    </label>
    <label>
      <radio value="1" checked="{{form.state==1}}" disabled='{{showJD}}'>已派单</radio>
      <radio value="1" checked="{{form.state==1}}" disabled='{{true}}'>已派单</radio>
    </label>
    <label>
      <radio value="2" checked="{{form.state==2}}" disabled='{{showJD}}'>已接单</radio>
      <radio value="2" checked="{{form.state==2}}" disabled='{{true}}'>已接单</radio>
    </label>
    <label>
      <radio value="3" checked="{{form.state==3}}" disabled='{{showJD}}'>已完成</radio>
      <radio value="3" checked="{{form.state==3}}" disabled='{{true}}'>已完成</radio>
    </label>
  <!-- </radio-group> -->
  </radio-group>
  <!-- <van-radio-group value="{{ from.state }}"  direction="horizontal">
    <van-radio name="0">未指派</van-radio>
    <van-radio name="1">已派单</van-radio>
@@ -54,21 +54,21 @@
    <image class="primg" src="/images/ProRep/uptext.png"></image>
    <view>用户姓名</view>
  </view>
  <input bindinput="shangbao" value="{{form.userName}}" class="textbox" placeholder="请输入用户姓名"></input>
  <input bindinput="changeUserName" value="{{form.userName}}" class="textbox" placeholder="请输入用户姓名"></input>
</view>
<view>
  <view class="title">
    <image class="primg" src="/images/ProRep/uptext.png"></image>
    <view>手机号</view>
  </view>
  <input bindinput="shangbao" value="{{form.userPhone}}" class="textbox" placeholder="请输入手机号"></input>
  <input bindinput="changePhone" value="{{form.userPhone}}" class="textbox" placeholder="请输入手机号"></input>
</view>
<view>
  <view class="title">
    <image class="primg" src="/images/ProRep/uptext.png"></image>
    <view>安装地址</view>
  </view>
  <input bindinput="shangbao" value="{{form.address}}" class="textbox" placeholder="请输入安装地址"></input>
  <input bindinput="changeaddress" value="{{form.address}}" class="textbox" placeholder="请输入安装地址"></input>
</view>
<view>
@@ -88,25 +88,25 @@
    <image class="primg" src="/images/ProRep/uptext.png"></image>
    <view>备注</view>
  </view>
  <textarea bindinput="shangbao" class="textbox" value="{{form.remark}}" placeholder="请输入备注内容..."></textarea>
  <textarea bindinput="changeRemark" class="textbox" value="{{form.remark}}" placeholder="请输入备注内容..."></textarea>
</view>
<!-- 上传图片 -->
<view>
<view wx:if="{{form&&form.state==3 }}">
  <view class="title">
    <image class="primg" src="/images/ProRep/imgicon.png"></image>
    <view>上传照片</view>
  </view>
  <view class="photoBox">
        <view wx:for="{{imageUrl}}" style="display:inline" class="upimgbox">
            <image class="upphotoimg" src="{{item}}" mode="aspectFill" style="margin-right:15rpx"></image>
            <image class="removeimg" src="/images/del.png" bindtap="removeimg" data-index="{{index}}"></image>
        </view>
        <image wx:if="{{imageUrl.length<2}}" class="upphotoimg" src="/images/img.png" mode="aspectFill" bindtap="chooseImage"></image>
        <view>尺寸在512*512以内,大小在500kb以内</view>
    </view>
    <view wx:for="{{imageUrl}}" style="display:inline" class="upimgbox">
      <image class="upphotoimg" src="{{item}}" mode="aspectFill" style="margin-right:15rpx"></image>
      <image class="removeimg" src="/images/del.png" bindtap="removeimg" data-index="{{index}}"></image>
    </view>
    <image wx:if="{{imageUrl.length<2}}" class="upphotoimg" src="{{imgUrl}}" mode="aspectFill" bindtap="chooseimage"></image>
    <!-- <view>尺寸在512*512以内,大小在500kb以内</view> -->
  </view>
</view>
<!-- <view class="addressBtn" bindtap="openBaiduMap">打开百度地图</view> -->
GoldC/pages/xiangqing/xiangqing.wxml
@@ -7,7 +7,7 @@
                    <view class="text">{{listdata.ManagementName}}</view>
                    <view class="title">
                    <image class="primg" src="/images/ProRep/uptext.png"></image>
                    问题描述:</view>
                    订单详情:</view>
                    <view class="text">{{listdata.Reported_Question}}</view>
                    <!-- <view class="xiangqingtxt" bindtap="toxiangqin" data-id="{{item.pk_Examine}}">查看详情></view> -->
                    <!-- <view class="title">问题点现场图片:</view> -->
GoldC/project.config.json
@@ -1,9 +1,5 @@
{
  "description": "项目配置文件",
  "packOptions": {
    "ignore": [],
    "include": []
  },
  "setting": {
    "urlCheck": false,
    "es6": true,
@@ -24,8 +20,6 @@
    "compileHotReLoad": false,
    "lazyloadPlaceholderEnable": false,
    "useMultiFrameRuntime": true,
    "useApiHook": true,
    "useApiHostProcess": true,
    "babelSetting": {
      "ignore": [],
      "disablePlugins": [],
@@ -44,14 +38,16 @@
    "condition": false
  },
  "compileType": "miniprogram",
  "libVersion": "2.12.0",
  "appid": "wxbe7578f86ae97314",
  "projectname": "water",
  "simulatorType": "wechat",
  "simulatorPluginLibVersion": {},
  "condition": {},
  "editorSetting": {
    "tabIndent": "insertSpaces",
    "tabSize": 2
  }
  },
  "packOptions": {
    "ignore": [],
    "include": []
  },
  "appid": "wxbe7578f86ae97314"
}