产品化更新

js_sdk/http.js

@@ -158,7 +158,7 @@ export function findRectificationManagementInOutById(e) {
 }
 export function repairList(data) {
     return $http.post(
-        '/wx/repair/list',
+        '/wx/repair/handleList',
         data, {}
     )
 }
@@ -202,11 +202,9 @@ export function getDispatchToPerson(data) {
 }
 export function getCompanyById(data) {
     return $http.post(
-        '/wx/repair/getCompanyById', data, {},
-
+        '/wx/roadShow/getCompanyById', data, {},
     )
 }
-
 export function getWxCompanyTags(e) {
     return $http.post(
         '/wx/MnpTagInfoController/tagInfoList', e, {}

pages/index/components/enterpriseSide.vue

@@ -230,11 +230,19 @@ export default {
     },
     getNotice(){
       newNotice().then(res=>{
-        const newNotice = res.data
-        newNotice.forEach(e=>{
-          e.time = this.showtime(e.releaseTime)
-        })
-        this.noticeList.push(...res.data)
+        if (res.code=='409'){
+          uni.clearStorageSync();
+          uni.reLaunch({
+            url: "/pages/login/login",
+          });
+        }
+        if (res.data){
+          const newNotice = res.data
+          newNotice.forEach(e=>{
+            e.time = this.showtime(e.releaseTime)
+          })
+          this.noticeList.push(...res.data)
+        }
       })
     },
     showtime(time) {

pages/index/index.vue

@@ -135,15 +135,15 @@ export default {
         // },
 
         {
-          label: "报修派单",
+          label: "报修受理",
           url: "https://www.idea-co-sf.com/gardenProduct/image/bxpd.png",
-          path: "/pages/subPackages/repairDispatch-app/index",
-        },
-        {
-          label: "报修处理",
-          url: "https://www.idea-co-sf.com/gardenProduct/image/bxcl.png",
           path: "/pages/subPackages/todo/repairAcceptance",
         },
+        // {
+        //   label: "报修处理",
+        //   url: "https://www.idea-co-sf.com/gardenProduct/image/bxcl.png",
+        //   path: "/pages/subPackages/todo/repairAcceptance",
+        // },
         {
           label: "房间管理",
           url: "https://www.idea-co-sf.com/gardenProduct/image/fjgl.png",

pages/mine/mine.vue

@@ -223,7 +223,7 @@ export default {
       });
     },
     editPassWord() {
-      uni.goNavigateBack();
+      uni.navigateBack();
     },
     async getUserInfo() {
       let data = await getUserInfo();

pages/subPackages/reportRepair/handleRepair.vue

@@ -0,0 +1,655 @@
+<template>
+  <div class="addRepair">
+    <div class="reportBody">
+      <ul class="detailUl">
+        <li class="detailLi">
+          <span class="liName">当前企业</span>
+          <span class="liInfo">{{ detail.companyName }}</span>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            <span style="color: red;margin-right: 10rpx;">*</span>
+            您是想
+          </span>
+          <span class="liInfo">
+             <van-radio-group :value="detail.type" disabled>
+                  <van-radio name="1">报事</van-radio>
+                  <van-radio name="2">咨询</van-radio>
+             </van-radio-group>
+          </span>
+        </li>
+        <li class="detailLi2">
+          <span class="liName">
+            快捷选择
+          </span>
+          <div class="detailLi2Box">
+            <div class="detailLi2BoxTop">
+              <div class="checkItem" :class="detail.serviceType===item.label?'checked':''" v-for="item in checkList">{{item.label}}</div>
+            </div>
+            <van-field
+                :value="detail.description"
+                autosize
+                type="textarea"
+                placeholder="请输入文字进行报事报修描述"
+                class="myField"
+                maxlength="800"
+                show-word-limit
+                readonly
+            />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            <span style="color: red;margin-right: 10rpx;">*</span>
+            位置
+          </span>
+          <span class="liInfo">
+             <van-radio-group :value="detail.position" disabled>
+                <van-radio name="1">室内</van-radio>
+                <van-radio name="2">公区</van-radio>
+             </van-radio-group>
+          </span>
+        </li>
+        <li class="detailLi2">
+          <span class="liName">
+            补充说明
+            <span style="color: #B3B3B3;font-size: 28rpx">（支持图片/视频上传限20M内，最多6张）</span>
+          </span>
+          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
+            <van-uploader
+                :max-count="6"
+                @delete="deleteRYXXZP"
+                :file-list="fileList"
+                @after-read="uploadRYXXZP"
+                :show-upload="true"
+            />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            报事人
+          </span>
+          <span class="liInfo">
+            章敏-18915281562 <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
+          </span>
+        </li>
+        <li class="detailLi" style="border-bottom: none">
+          <span class="liName">
+            报事时间
+          </span>
+          <span class="liInfo">
+            2024-05-16  15：30
+          </span>
+        </li>
+      </ul>
+    </div>
+    <div class="handleBox">
+      <div class="handleTitle">处理情况</div>
+      <div class="imageBox">
+        <div class="imageItem">
+          <img src="https://www.idea-co-sf.com/gardenProduct/image/upImage.svg" class="handleImg">
+          <span>上报</span>
+        </div>
+        <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
+        <div class="imageItem">
+          <img src="https://www.idea-co-sf.com/gardenProduct/image/acceptance.svg" class="handleImg">
+          <span>受理</span>
+        </div>
+        <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
+        <div class="imageItem">
+          <img :src="optionsType==='待受理'?'https://www.idea-co-sf.com/gardenProduct/image/unHandle.svg':'https://www.idea-co-sf.com/gardenProduct/image/handle.svg'" class="handleImg">
+          <span>处理</span>
+        </div>
+        <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
+        <div class="imageItem">
+          <img src="https://www.idea-co-sf.com/gardenProduct/image/evaluate.svg" class="handleImg">
+          <span>评价</span>
+        </div>
+      </div>
+    </div>
+    <div class="reportBody" v-if="optionsType!=='已处理'">
+      <ul class="detailUl">
+        <li class="detailLi">
+           <span class="liInfo">
+              <label>
+                  <radio value="报事" :checked="optionsType==='待受理'" color="#0365F9" :disabled="optionsType==='待处理'"/>派单
+              </label>
+              <label style="margin-left: 64rpx">
+                  <radio value="咨询" :checked="optionsType==='待处理'" color="#0365F9" :disabled="optionsType==='待受理'"/>处理
+               </label>
+          </span>
+        </li>
+        <li class="detailLi" v-if="optionsType==='待受理'">
+          <span class="liName">
+            派单给
+          </span>
+          <span class="liInfo">
+            李开心
+          </span>
+        </li>
+        <li class="detailLi2" v-if="optionsType==='待受理'">
+           <span class="liName" style="margin-bottom: 16rpx">
+            备注
+          </span>
+          <van-field
+              :value="form.contant"
+              autosize
+              type="textarea"
+              placeholder="请输入文字进行报事报修描述"
+              class="myField2"
+              maxlength="800"
+              show-word-limit
+          />
+        </li>
+        <li class="detailLi2" v-if="optionsType==='待处理'">
+          <span class="liName">
+            处理后拍照
+            <span style="color: #B3B3B3;font-size: 28rpx">（支持图片上传限20M内，最多6张）</span>
+          </span>
+          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
+            <van-uploader
+                :max-count="6"
+                @delete="deleteRYXXZP"
+                :file-list="fileList"
+                @after-read="uploadRYXXZP"
+                :show-upload="true"
+            />
+          </div>
+        </li>
+        <li class="detailLi" v-if="optionsType==='待处理'">
+          <span class="liName">
+            处理人
+          </span>
+          <span class="liInfo">
+            李开心
+          </span>
+        </li>
+        <li class="detailLi" v-if="optionsType==='待处理'" style="border-bottom: none">
+          <span class="liName">
+            处理时间
+          </span>
+          <span class="liInfo">
+            {{timeNow}}
+          </span>
+        </li>
+      </ul>
+    </div>
+    <div class="reportBody" v-if="optionsType==='已处理'">
+      <div class="handleTitle">派单信息</div>
+      <ul class="detailUl">
+        <li class="detailLi">
+          <span class="liName">
+            派单给
+          </span>
+          <span class="liInfo">
+            李开心
+          </span>
+        </li>
+        <li class="detailLi2">
+           <span class="liName" style="margin-bottom: 16rpx">
+            备注
+          </span>
+          <van-field
+              :value="form.contant"
+              autosize
+              type="textarea"
+              placeholder="请输入文字进行报事报修描述"
+              class="myField2"
+              maxlength="800"
+              show-word-limit
+          />
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            派单人
+          </span>
+          <span class="liInfo">
+            李欣怡
+          </span>
+        </li>
+        <li class="detailLi" style="border-bottom: none">
+          <span class="liName">
+            派单时间
+          </span>
+          <span class="liInfo">
+            2024-05-18  15：30
+          </span>
+        </li>
+      </ul>
+    </div>
+    <div class="reportBody" v-if="optionsType==='已处理'">
+      <div class="handleTitle">处理信息</div>
+      <ul class="detailUl">
+        <li class="detailLi2">
+          <span class="liName">
+            处理后拍照
+            <span style="color: #B3B3B3;font-size: 28rpx">（支持图片上传限20M内，最多6张）</span>
+          </span>
+          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
+            <van-uploader
+                :max-count="6"
+                @delete="deleteRYXXZP"
+                :file-list="fileList"
+                @after-read="uploadRYXXZP"
+                :show-upload="true"
+            />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            处理人
+          </span>
+          <span class="liInfo">
+            李开心
+          </span>
+        </li>
+        <li class="detailLi" style="border-bottom: none">
+          <span class="liName">
+            处理时间
+          </span>
+          <span class="liInfo">
+            2024-05-18  15：30
+          </span>
+        </li>
+      </ul>
+    </div>
+    <div class="reportBody" v-if="optionsType==='已处理'">
+      <div class="evaluationBox" >
+        <span class="evaName">您对本次服务的评价</span>
+        <van-rate
+            :value="value"
+            :size="24"
+            gutter="32rpx"
+            void-color="#eee"
+            bind:change="onChange"
+            color="#fd9a63"
+        />
+      </div>
+    </div>
+    <div class="buttonBox">
+      <button class="zcBtn" @tap="closePage" :class="optionsType==='已处理'?'btn2':'btn '">关闭</button>
+      <button class="btn tjBtn" v-if="optionsType==='待受理'">提交派单</button>
+      <button class="btn tjBtn" v-if="optionsType==='待处理'">处理完成</button>
+    </div>
+  </div>
+</template>
+<script>
+import {getRepairDispatchById,getUserLocalStorageInfo,getByCodes } from "@/js_sdk/http";
+export default {
+  data(){
+    return{
+      dc_key: ['QUICK_SELECTION'],
+      isCheck:false,
+      isCheck2:false,
+      detail:{
+      },
+      checkList:[
+        // {name:'挂件安装',isCheck:true},
+        // {name:'我要投诉',isCheck:false},
+        // {name:'疏通管道',isCheck:false},
+        // {name:'维修线路',isCheck:false},
+        // {name:'更换灯泡',isCheck:false},
+        // {name:'网络维修',isCheck:false},
+        // {name:'保洁服务',isCheck:false},
+        // {name:'其他维修',isCheck:false},
+      ],
+      fileList:[],
+      optionsType:'',
+      timeNow:'',
+      value: "5",
+      id:'',
+      dic_SelectList:[]
+    }
+  },
+  onLoad(options) {
+    const item = JSON.parse(options.item)
+    this.id = item.id
+    console.log('11111',this.id)
+    this.optionsType = item.type
+    if (options.type==='待处理'){
+      uni.setNavigationBarTitle({
+        title: '报修处理',
+      });
+    }else if(options.type==='已处理'){
+      uni.setNavigationBarTitle({
+        title: '报修详情',
+      });
+    }else {
+      uni.setNavigationBarTitle({
+        title: '报修派单',
+      });
+    }
+    this.getByCodes()
+  },
+  mounted(){
+    this.getTime()
+  },
+  methods:{
+    // toRecord() {
+    //   uni.navigateTo({
+    //     url:'/pages/subPackages/reportRepair/repairRecord'
+    //   })
+    // },
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dc_key));
+      this.dic_SelectList = this.$common.handleDicList(data);
+      this.checkList = this.dic_SelectList.QUICK_SELECTION
+      this.getById()
+    },
+    getById(){
+      const _this = this
+      getRepairDispatchById(this.id).then(res=>{
+        if (res.data) {
+          const det = _this.getItemJson(res.data)
+          this.detail = det
+          console.log('this.detail',this.detail)
+          this.explainAnnexList = det.fileUrlList
+          this.processedAnnexList = det.handleUrlList
+          this.detailStatus = det.status
+          this.params = {
+            id: det.id,
+            evaluateNum: det.evaluateNum,
+            score: det.score
+          }
+          this.evaluateVal = ((det.score == null ? 0 : det.score) / (det.evaluateNum == null ? 1 : det.evaluateNum))
+        }
+      })
+    },
+    getTime(){
+      let timestamp = new Date().getTime();
+      let dateStr = new Date().toLocaleDateString();
+
+      let date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+      let hours = date.getHours();
+      let minutes = date.getMinutes();
+      let fullDateStr = `${year}-${month}-${day} ${hours}:${minutes}`;
+      console.log(fullDateStr);
+      this.timeNow = fullDateStr
+    },
+
+    getItemJson: function(item) {
+      item.releaseTime = this.$common.transDate(item.releaseTime)
+      item.createdAt = this.$common.transDate(item.createdAt)
+
+      let transformedObject = this.dic_SelectList.QUICK_SELECTION.reduce((acc, obj) => {
+        acc[obj.value] = obj.label;
+        return acc;
+      }, {});
+
+      item.serviceType = transformedObject[item.serviceType]
+      if (item.userId) {
+        const user = item.userId.split('-')
+        item.userPhone = user[1] + '-' + user[2]
+        item.phone = user[2]
+      }
+      if (item.handleUserId) {
+        const test = item.handleUserId.split('-')
+        item.handleUserId = test[1] + '-' + test[2]
+        item.hanleUserPhone = test[2]
+      }
+      item.handleTime = this.$common.transDate(item.handleTime)
+      switch (item.status) {
+        case 'unAcceptance':
+          this.stepActive = 0
+          break
+        case 'acceptance':
+          this.stepActive = 1
+          break
+        case 'evaluated':
+          this.stepActive = 3
+          break
+        case 'processed':
+          this.stepActive = 2
+          break
+      }
+      if (item.fileUrl){
+        const fileUrl = item.fileUrl.split(',')
+        const newFile = []
+        fileUrl.forEach((e=>{
+              newFile.push({
+                imgUrl: "/FileController/download/" + e,
+                id: e,
+                url: this.$constant.BASE_URI +
+                    "/FileController/download/" +
+                    e,
+                isImage: true,
+              });
+            })
+        )
+        item.fileUrl = newFile
+      }
+
+      const handleUrls = this.$common.castEval(item.handleUrl)
+      const handleUrl = []
+      if (handleUrls !== null && handleUrls.length > 0) {
+        handleUrls.forEach(item => {
+          if (item.url) {
+            const ul = {
+              type: 'image',
+              url: item.url.replace('/server', '/smartParkH5Server')
+            }
+            handleUrl.push(ul)
+          }
+        })
+      }
+      item.handleUrlList = handleUrl
+      console.log('item',item)
+      return item
+    },
+    closePage() {
+      uni.navigateTo({
+        url:'/pages/subPackages/todo/repairAcceptance'
+      })
+    },
+    deleteRYXXZP(event) {
+      this.fileList.splice(event.detail.index, 1);
+      this.$forceUpdate();
+    },
+    uploadRYXXZP(event) {
+      console.log(event)
+      let that = this;
+      const { file } = event.detail;
+      uni.uploadFile({
+        url: that.$constant.BASE_URI + "/wx/fileController/upload",
+        filePath: file.url,
+        name: "file",
+        formData: { user: "test" },
+        success(res) {
+          // 上传完成需要更新 fileList
+          let data = JSON.parse(res.data);
+          that.fileList.push({
+            imgUrl: "/FileController/download/" + data.data[0],
+            id: data.data[0],
+            url:
+                that.$constant.BASE_URI +
+                "/FileController/download/" +
+                data.data[0],
+            isImage: true,
+          });
+        },
+        fail(res) {},
+      });
+    },
+  }
+}
+</script>
+<style lang="scss">
+.addRepair{
+  .reportBody{
+    margin-top: 24rpx;
+    padding: 38rpx 36rpx;
+    background: white;
+    //height: 1416rpx;
+    box-sizing: border-box;
+    .record {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      color: #0365F9;
+      font-size: 32rpx;
+      .recordImg{
+        width: 36rpx;
+        height: 36rpx;
+        padding: 5rpx 0 0 10rpx;
+      }
+    }
+    .detailUl{
+      margin-top: 20rpx;
+      .liName{
+        font-size: 32rpx;
+        color: rgba(51, 51, 51, 1);
+        white-space: nowrap;
+      }
+      .detailLi{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 32rpx 0;
+        border-bottom: 2rpx solid #E6E6E6;
+        .liInfo{
+          display: inline-block;
+          text-align: right;
+          max-width: 428rpx;
+          color: rgba(102, 102, 102, 1);
+          font-size: 32rpx;
+          line-height: 38rpx;
+          display: flex;
+          align-items: center;
+          .phoneIcon{
+            width: 64rpx;
+            height: 64rpx;
+            margin-left: 24rpx;
+          }
+        }
+        .van-radio-group{
+          display: flex;
+          align-items: center;
+          gap: 0 32rpx;
+        }
+      }
+      .detailLi2{
+        display: flex;
+        flex-direction: column;
+        padding: 32rpx 0;
+        border-bottom: 2rpx solid #E6E6E6;
+        .detailLi2BoxTop{
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: space-between;
+          margin: 12rpx 0;
+          .checkItem{
+            width: 160rpx;
+            height: 64rpx;
+            font-size: 28rpx;
+            color: #666666;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background: #F5F7FA;
+            border-radius: 8rpx;
+            margin: 12rpx 0;
+          }
+          .checked{
+            background: #0365F9;
+            color: white;
+          }
+        }
+      }
+    }
+  }
+  .van-cell {
+    background: #F5F7FA !important;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+  }
+  .buttonBox{
+    display: flex;
+    justify-content: center;
+    .btn{
+      width: 240rpx;
+      height: 80rpx;
+      display: flex;
+      border-radius: 8rpx;
+      align-items: center;
+      justify-content: center;
+      margin: 48rpx 16rpx 150rpx 16rpx;
+      color: white;
+      letter-spacing: 2rpx;
+      text-indent: 2rpx;
+    }
+    .btn2{
+      width: 654rpx;
+      height: 96rpx;
+      display: flex;
+      border-radius: 8rpx;
+      align-items: center;
+      justify-content: center;
+      margin: 48rpx 48rpx 150rpx 48rpx;
+      color: white;
+      letter-spacing: 2rpx;
+      text-indent: 2rpx;
+    }
+    .zcBtn{
+      background: rgba(0, 0, 0, 0.05);
+      color: rgba(3, 101, 249, 1);
+      &::after{
+        border: none;
+      }
+    }
+    .tjBtn{
+      background: #0365F9;
+    }
+  }
+  .handleBox{
+    background: white;
+    padding: 32rpx;
+    margin: 24rpx 0;
+    .imageBox{
+      display: flex;
+      justify-content: space-evenly;
+      align-items: center;
+      margin-top: 48rpx;
+      .handleImg{
+        width: 72rpx;
+        height: 72rpx;
+        margin-bottom: 8rpx;
+      }
+      .handleArrow{
+        width: 64rpx;
+        height: 20rpx;
+      }
+    }
+    .imageItem{
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      color: rgba(34, 34, 34, 1);
+      font-size: 28rpx;
+    }
+  }
+  .handleTitle{
+    color: rgba(34, 34, 34, 1);
+    font-size: 36rpx;
+    font-weight: 600;
+  }
+  .evaluationBox {
+    width: 686rpx;
+    height: 100rpx;
+    padding: 0 24rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background: #f5f7fa;
+    border-radius: 8rpx;
+    box-sizing: border-box;
+    margin-top: 24rpx;
+    .evaName{
+      font-size: 32rpx;
+      color: rgba(51, 51, 51, 1);
+    }
+  }
+}
+</style>

pages/subPackages/reportRepair/index.vue

@@ -58,11 +58,13 @@
           </span>
           <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
             <van-uploader
+                accept="media"
                 :max-count="6"
                 @delete="deleteRYXXZP"
                 :file-list="fileList"
                 @after-read="uploadRYXXZP"
                 :show-upload="true"
+                @click-preview="showClick"
             />
           </div>
         </li>
@@ -95,6 +97,7 @@ export default {
       form: {
         groupId: '',
         companyId: getUserLocalStorageInfo().userId,
+        companyName: getUserLocalStorageInfo().username,
         type: '1',
         serviceType: '',
         description: '',
@@ -123,6 +126,9 @@ export default {
     this.getByCodes()
   },
   methods:{
+    showClick(e){
+      console.log(e)
+    },
     changeIpt(e){
       this.form.description = e.detail
     },
@@ -174,9 +180,10 @@ export default {
       }
       let picArr = []
       this.fileList.forEach(item=>{
-        picArr.push(item.id)
+        // console.log(item)
+        picArr.push(item)
       })
-      this.form.fileUrl = picArr.toString()
+      this.form.fileUrl = JSON.stringify(picArr)
       this.form.serviceType = this.quickSleced.value
       this.form.createdBy = this.getUserLocalStorageInfo.userId
       repairAdd(this.form).then((res) => {
@@ -190,7 +197,6 @@ export default {
           url:'/pages/subPackages/reportRepair/repairRecord'
         })
       })
-      // console.log(this.form)
     },
     deleteRYXXZP(event) {
       this.fileList.splice(event.detail.index, 1);
@@ -200,6 +206,7 @@ export default {
       // console.log(event)
       let that = this;
       const { file } = event.detail;
+      console.log(event.detail)
       uni.uploadFile({
         url: that.$constant.BASE_URI + "/wx/fileController/upload",
         filePath: file.url,
@@ -208,15 +215,29 @@ export default {
         success(res) {
           // 上传完成需要更新 fileList
           let data = JSON.parse(res.data);
-          that.fileList.push({
-            imgUrl: "/FileController/download/" + data.data[0],
-            id: data.data[0],
-            url:
-                that.$constant.BASE_URI +
-                "/FileController/download/" +
-                data.data[0],
-            isImage: true,
-          });
+          if (event.detail.file.type==='image'){
+            that.fileList.push({
+              imgUrl: "/FileController/download/" + data.data[0],
+              id: data.data[0],
+              url:
+                  that.$constant.BASE_URI +
+                  "/FileController/download/" +
+                  data.data[0],
+                  type:event.detail.file.type,
+                  isImage:true,
+            });
+          }else{
+            that.fileList.push({
+              imgUrl: "/FileController/download/" + data.data[0],
+              id: data.data[0],
+              url:
+                  that.$constant.BASE_URI +
+                  "/FileController/download/" +
+                  data.data[0],
+                  type:event.detail.file.type,
+                  isVideo:true
+            });
+          }
         },
         fail(res) {},
       });

pages/subPackages/reportRepair/repairDetail.vue

@@ -55,14 +55,25 @@
             补充说明
             <span style="color: #B3B3B3;font-size: 28rpx">（支持图片/视频上传限20M内，最多6张）</span>
           </span>
-          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
-            <van-uploader
-                :max-count="6"
-                @delete="deleteRYXXZP"
-                :file-list="fileList"
-                @after-read="uploadRYXXZP"
-                :show-upload="true"
-            />
+          <div style="display: flex;flex-wrap: wrap;gap: 24rpx">
+            <div class="detailLi2Box annex-item"
+                 style="margin: 24rpx 0 0 0"
+                 v-for="(item, index) in explainAnnexList"
+                 :key="index">
+              <img :src="item.url" alt="" v-if="item.type === 'image'" class="anImg" @tap="clickImg(item.url)"/>
+            </div>
+          </div>
+          <div class="detailLi2Box annex-item"
+               style="margin: 24rpx 0 0 0"
+               v-for="(item, index) in explainAnnexList"
+               :key="index+999">
+            <video
+                :src="item.url"
+                v-if="item.type === 'video'"
+                style="width: 686rpx"
+                height="100%"
+                autoplay
+            ></video>
           </div>
         </li>
         <li class="detailLi">
@@ -70,7 +81,7 @@
             报事人
           </span>
           <span class="liInfo">
-            章敏-18915281562 <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
+            {{detail.userName}} <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
           </span>
         </li>
         <li class="detailLi" style="border-bottom: none">
@@ -78,7 +89,7 @@
             报事时间
           </span>
           <span class="liInfo">
-            2024-05-16  15：30
+            {{detail.createdAt}}
           </span>
         </li>
       </ul>
@@ -92,12 +103,12 @@
         </div>
         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
         <div class="imageItem">
-          <img src="https://www.idea-co-sf.com/gardenProduct/image/acceptance.svg" class="handleImg">
+          <img :src="stepActive==='已受理'||stepActive==='已处理'?'https://www.idea-co-sf.com/gardenProduct/image/acceptance.svg':'https://www.idea-co-sf.com/gardenProduct/image/unAcceptance.svg'" class="handleImg">
           <span>受理</span>
         </div>
         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
         <div class="imageItem">
-          <img :src="optionsType==='待受理'?'https://www.idea-co-sf.com/gardenProduct/image/unHandle.svg':'https://www.idea-co-sf.com/gardenProduct/image/handle.svg'" class="handleImg">
+          <img :src="stepActive==='已处理'?'https://www.idea-co-sf.com/gardenProduct/image/handle.svg':'https://www.idea-co-sf.com/gardenProduct/image/unHandle.svg'" class="handleImg">
           <span>处理</span>
         </div>
         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
@@ -107,74 +118,7 @@
         </div>
       </div>
     </div>
-    <div class="reportBody" v-if="optionsType!=='已处理'">
-      <ul class="detailUl">
-        <li class="detailLi">
-           <span class="liInfo">
-              <label>
-                  <radio value="报事" :checked="optionsType==='待受理'" color="#0365F9" :disabled="optionsType==='待处理'"/>派单
-              </label>
-              <label style="margin-left: 64rpx">
-                  <radio value="咨询" :checked="optionsType==='待处理'" color="#0365F9" :disabled="optionsType==='待受理'"/>处理
-               </label>
-          </span>
-        </li>
-        <li class="detailLi" v-if="optionsType==='待受理'">
-          <span class="liName">
-            派单给
-          </span>
-          <span class="liInfo">
-            李开心
-          </span>
-        </li>
-        <li class="detailLi2" v-if="optionsType==='待受理'">
-           <span class="liName" style="margin-bottom: 16rpx">
-            备注
-          </span>
-          <van-field
-              :value="form.contant"
-              autosize
-              type="textarea"
-              placeholder="请输入文字进行报事报修描述"
-              class="myField2"
-              maxlength="800"
-              show-word-limit
-          />
-        </li>
-        <li class="detailLi2" v-if="optionsType==='待处理'">
-          <span class="liName">
-            处理后拍照
-            <span style="color: #B3B3B3;font-size: 28rpx">（支持图片上传限20M内，最多6张）</span>
-          </span>
-          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
-            <van-uploader
-                :max-count="6"
-                @delete="deleteRYXXZP"
-                :file-list="fileList"
-                @after-read="uploadRYXXZP"
-                :show-upload="true"
-            />
-          </div>
-        </li>
-        <li class="detailLi" v-if="optionsType==='待处理'">
-          <span class="liName">
-            处理人
-          </span>
-          <span class="liInfo">
-            李开心
-          </span>
-        </li>
-        <li class="detailLi" v-if="optionsType==='待处理'" style="border-bottom: none">
-          <span class="liName">
-            处理时间
-          </span>
-          <span class="liInfo">
-            {{timeNow}}
-          </span>
-        </li>
-      </ul>
-    </div>
-    <div class="reportBody" v-if="optionsType==='已处理'">
+    <div class="reportBody" v-if="stepActive==='已处理'||stepActive==='已受理'">
       <div class="handleTitle">派单信息</div>
       <ul class="detailUl">
         <li class="detailLi">
@@ -217,7 +161,7 @@
         </li>
       </ul>
     </div>
-    <div class="reportBody" v-if="optionsType==='已处理'">
+    <div class="reportBody" v-if="stepActive==='已处理'">
       <div class="handleTitle">处理信息</div>
       <ul class="detailUl">
         <li class="detailLi2">
@@ -253,7 +197,7 @@
         </li>
       </ul>
     </div>
-    <div class="reportBody" v-if="optionsType==='已处理'">
+    <div class="reportBody" v-if="stepActive==='已处理'">
       <div class="evaluationBox" >
         <span class="evaName">您对本次服务的评价</span>
         <van-rate
@@ -267,9 +211,8 @@
       </div>
     </div>
     <div class="buttonBox">
-      <button class="zcBtn" @tap="closePage" :class="optionsType==='已处理'?'btn2':'btn '">关闭</button>
-      <button class="btn tjBtn" v-if="optionsType==='待受理'">提交派单</button>
-      <button class="btn tjBtn" v-if="optionsType==='待处理'">处理完成</button>
+      <button class="zcBtn" @tap="closePage" :class="stepActive==='已处理'?'btn2':'btn '">关闭</button>
+      <button class="btn tjBtn" v-if="stepActive==='已处理'">提交</button>
     </div>
   </div>
 </template>
@@ -298,7 +241,10 @@ export default {
       timeNow:'',
       value: "5",
       id:'',
-      dic_SelectList:[]
+      dic_SelectList:[],
+      explainAnnexList:[],
+      processedAnnexList:[],
+      stepActive:'0'
     }
   },
   onLoad(options) {
@@ -330,6 +276,19 @@ export default {
     //     url:'/pages/subPackages/reportRepair/repairRecord'
     //   })
     // },
+    // 放大图片
+    clickImg(url) {
+      wx.previewImage({
+        urls: [url], //接受的是一个数组，默认展示第一张
+        current: "",
+        success: function (res) {
+        },
+        fail: function (res) {
+        },
+        complete: function (res) {
+        },
+      })
+    },
     async getByCodes() {
       let data = await getByCodes(JSON.stringify(this.dc_key));
       this.dic_SelectList = this.$common.handleDicList(data);
@@ -393,36 +352,36 @@ export default {
       item.handleTime = this.$common.transDate(item.handleTime)
       switch (item.status) {
         case 'unAcceptance':
-          this.stepActive = 0
+          this.stepActive = '待受理'
           break
         case 'acceptance':
-          this.stepActive = 1
+          this.stepActive = '已受理'
           break
         case 'evaluated':
-          this.stepActive = 3
+          this.stepActive = '已处理'
           break
         case 'processed':
-          this.stepActive = 2
+          this.stepActive = '暂存'
           break
       }
       if (item.fileUrl){
-        const fileUrl = item.fileUrl.split(',')
+        console.log('item.fileUrl' ,JSON.parse(item.fileUrl))
+        const fileUrl = JSON.parse(item.fileUrl)
         const newFile = []
         fileUrl.forEach((e=>{
               newFile.push({
-                imgUrl: "/FileController/download/" + e,
-                id: e,
-                url: this.$constant.BASE_URI +
-                    "/FileController/download/" +
-                    e,
-                isImage: true,
+                imgUrl: e.imgUrl,
+                id: e.id,
+                url: e.url,
+                type: e.type,
               });
             })
         )
-        item.fileUrl = newFile
+        console.log('newFile',newFile)
+        item.fileUrlList = newFile
       }
 
-      const handleUrls = this.$common.castEval(item.handleUrl)
+      const handleUrls = JSON.parse(item.handleUrl)
       const handleUrl = []
       if (handleUrls !== null && handleUrls.length > 0) {
         handleUrls.forEach(item => {
@@ -440,9 +399,7 @@ export default {
       return item
     },
     closePage() {
-      uni.navigateTo({
-        url:'/pages/subPackages/todo/repairAcceptance'
-      })
+      uni.navigateBack({})
     },
     deleteRYXXZP(event) {
       this.fileList.splice(event.detail.index, 1);
@@ -560,6 +517,10 @@ export default {
       }
     }
   }
+  .anImg{
+    width: 200rpx;
+    height: 200rpx;
+  }
   .van-cell {
     background: #F5F7FA !important;
     border-radius: 8rpx;

pages/subPackages/reportRepair/repairRecord.vue

@@ -17,6 +17,7 @@
 </template>
 <script>
 import {repairList,getUserLocalStorageInfo,getByCodes } from "@/js_sdk/http";
+import {isImageFile} from "../../../wxcomponents/weapp/lib/uploader/utils";
 
 export default {
     data(){
@@ -48,6 +49,15 @@ export default {
       getList(){
         const _this = this
         repairList(this.params).then(res=>{
+          // console.log(res.code)
+          if (res.code == '409'){
+            // console.log(222)
+            uni.navigateTo({
+              url: "/pages/login2/login",
+              success: function (e) {
+              },
+            });
+          }
           if (res.data) {
             res.data.forEach(function(item) {
               const jsonMap = _this.getItemJson(item)

pages/subPackages/todo/addRepair.vue

@@ -1,27 +1,20 @@
 <template>
-  <div class="addRepair">
+  <div class="reportRepair">
     <div class="reportBody">
-<!--      <div class="record" @click.stop="toRecord">-->
-<!--        报事记录 <img src="https://www.idea-co-sf.com/gardenProduct/image/rightIcon.png" class="recordImg">-->
-<!--      </div>-->
       <ul class="detailUl">
         <li class="detailLi">
           <span class="liName">当前企业</span>
-          <span class="liInfo">无锡XXXXX有限公司</span>
+          <input class="liInfo" style="text-align: right" v-model="form.companyName"/>
         </li>
         <li class="detailLi">
           <span class="liName">
             <span style="color: red;margin-right: 10rpx;">*</span>
             您是想
           </span>
-          <span class="liInfo">
-              <label class="radio"  @click.stop="isCheck=true" >
-                  <radio value="报事" :checked="isCheck" color="#0365F9"/>报事
-              </label>
-              <label class="radio" @click.stop="isCheck=false" >
-                  <radio value="咨询" :checked="!isCheck" color="#0365F9"/>咨询
-               </label>
-          </span>
+          <van-radio-group :value="form.type" @change="onChange">
+            <van-radio name="1">报事</van-radio>
+            <van-radio name="2">咨询</van-radio>
+          </van-radio-group>
         </li>
         <li class="detailLi2">
           <span class="liName">
@@ -29,16 +22,19 @@
           </span>
           <div class="detailLi2Box">
             <div class="detailLi2BoxTop">
-              <div class="checkItem" :class="item.isCheck?'checked':''" v-for="item in checkList" @click="clickCheck(item)">{{item.name}}</div>
+              <div class="checkItem" :class="{
+                  checked: quickSleced.value && item.value === quickSleced.value,
+                }" v-for="item in checkList" @click="clickCheck(item)">{{item.label}}</div>
             </div>
             <van-field
-                :value="form.contant"
+                :value="form.description"
                 autosize
                 type="textarea"
                 placeholder="请输入文字进行报事报修描述"
                 class="myField"
                 maxlength="800"
                 show-word-limit
+                @input="changeIpt"
             />
           </div>
         </li>
@@ -47,14 +43,10 @@
             <span style="color: red;margin-right: 10rpx;">*</span>
             位置
           </span>
-          <span class="liInfo">
-              <label class="radio"  @click.stop="isCheck2=true" >
-                  <radio value="报事" :checked="isCheck2" color="#0365F9"/>室内
-              </label>
-              <label class="radio" @click.stop="isCheck2=false" >
-                  <radio value="咨询" :checked="!isCheck2" color="#0365F9"/>公区
-               </label>
-          </span>
+          <van-radio-group :value="form.position" @change="onChange2">
+            <van-radio name="1">室内</van-radio>
+            <van-radio name="2">公区</van-radio>
+          </van-radio-group>
         </li>
         <li class="detailLi2">
           <span class="liName">
@@ -63,11 +55,13 @@
           </span>
           <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
             <van-uploader
+                accept="media"
                 :max-count="6"
                 @delete="deleteRYXXZP"
                 :file-list="fileList"
                 @after-read="uploadRYXXZP"
                 :show-upload="true"
+                @click-preview="showClick"
             />
           </div>
         </li>
@@ -76,61 +70,140 @@
             报事人
           </span>
           <span class="liInfo">
-            章敏-18915281562
+            {{submitUser}}
           </span>
         </li>
       </ul>
     </div>
     <div class="buttonBox">
-      <button class="btn zcBtn" @tap="closePage">关闭</button>
-      <button class="btn tjBtn">保存</button>
+      <button class="btn zcBtn">暂存</button>
+      <button class="btn tjBtn" @tap="submit">提交</button>
     </div>
   </div>
 </template>
 <script>
+import { repairAdd,getUserLocalStorageInfo,getByCodes, getCompanyById} from "@/js_sdk/http";
+import dayjs from "dayjs";
 export default {
   data(){
     return{
+      getUserLocalStorageInfo: getUserLocalStorageInfo(),
+      dc_key: ['QUICK_SELECTION'],
       isCheck:false,
       isCheck2:false,
-      form:{
-        contant:''
+      form: {
+        groupId: '',
+        companyId: getUserLocalStorageInfo().userId,
+        type: '1',
+        serviceType: '',
+        description: '',
+        position: '1',
+        userId:getUserLocalStorageInfo().userId + '-' + getUserLocalStorageInfo().username + '-' + getUserLocalStorageInfo().phone,
+        fileUrl: '',
+        status: 'unAcceptance'
       },
+      submitUser:getUserLocalStorageInfo().username + '-' + getUserLocalStorageInfo().phone,
       checkList:[
-        {name:'挂件安装',isCheck:true},
-        {name:'我要投诉',isCheck:false},
-        {name:'疏通管道',isCheck:false},
-        {name:'维修线路',isCheck:false},
-        {name:'更换灯泡',isCheck:false},
-        {name:'网络维修',isCheck:false},
-        {name:'保洁服务',isCheck:false},
-        {name:'其他维修',isCheck:false},
+        // {name:'挂件安装'},
+        // {name:'我要投诉'},
+        // {name:'疏通管道'},
+        // {name:'维修线路'},
+        // {name:'更换灯泡'},
+        // {name:'网络维修'},
+        // {name:'保洁服务'},
+        // {name:'其他维修'},
       ],
-      fileList:[]
+      quickSleced: {},
+      fileList:[],
+      dic_SelectList:[]
     }
+  },
+  created(){
+    this.getByCodes()
+  },
+  mounted(){
+
   },
   methods:{
-    // toRecord() {
-    //   uni.navigateTo({
-    //     url:'/pages/subPackages/reportRepair/repairRecord'
-    //   })
-    // },
-    closePage() {
+    showClick(e){
+      console.log(e)
+    },
+    changeIpt(e){
+      this.form.description = e.detail
+    },
+    onChange(e){
+      // console.log(e)
+      this.form.type = e.detail
+    },
+    onChange2(e){
+      // console.log(e)
+      this.form.position = e.detail
+    },
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dc_key));
+      this.dic_SelectList = this.$common.handleDicList(data);
+      this.checkList = this.dic_SelectList.QUICK_SELECTION
+    },
+    toRecord() {
       uni.navigateTo({
-        url:'/pages/subPackages/todo/repairAcceptance'
+        url:'/pages/subPackages/reportRepair/repairRecord'
       })
     },
     clickCheck(item){
-      item.isCheck = !item.isCheck
+      if (this.quickSleced.value && this.quickSleced.value === item.value) {
+        this.quickSleced = {}
+      } else {
+        this.quickSleced = item
+        // this.form.description = item.lable
+        this.$set(this.form, 'description', item.label)
+      }
+    },
+    submit(){
+      if (this.quickSleced.value == null || this.quickSleced.value === '') {
+        uni.showToast({
+          title: '请选择服务类型',
+          icon: 'none',
+          mask: true,
+          duration: 1000
+        });
+        return
+      }
+      if (this.fileList.length <= 0 || !this.fileList){
+        uni.showToast({
+          title: '请上传补充说明图片',
+          icon: 'none',
+          mask: true,
+          duration: 1000
+        });
+        return
+      }
+      let picArr = []
+      this.fileList.forEach(item=>{
+        // console.log(item)
+        picArr.push(item)
+      })
+      this.form.fileUrl = JSON.stringify(picArr)
+      this.form.serviceType = this.quickSleced.value
+      this.form.createdBy = this.getUserLocalStorageInfo.userId
+      repairAdd(this.form).then((res) => {
+        uni.showToast({
+          title: '填报成功',
+          icon: 'success',
+          mask: true,
+          duration: 1000
+        });
+        uni.navigateBack()
+      })
     },
     deleteRYXXZP(event) {
       this.fileList.splice(event.detail.index, 1);
       this.$forceUpdate();
     },
     uploadRYXXZP(event) {
-      console.log(event)
+      // console.log(event)
       let that = this;
       const { file } = event.detail;
+      console.log(event.detail)
       uni.uploadFile({
         url: that.$constant.BASE_URI + "/wx/fileController/upload",
         filePath: file.url,
@@ -139,15 +212,29 @@ export default {
         success(res) {
           // 上传完成需要更新 fileList
           let data = JSON.parse(res.data);
-          that.fileList.push({
-            imgUrl: "/FileController/download/" + data.data[0],
-            id: data.data[0],
-            url:
-                that.$constant.BASE_URI +
-                "/FileController/download/" +
-                data.data[0],
-            isImage: true,
-          });
+          if (event.detail.file.type==='image'){
+            that.fileList.push({
+              imgUrl: "/FileController/download/" + data.data[0],
+              id: data.data[0],
+              url:
+                  that.$constant.BASE_URI +
+                  "/FileController/download/" +
+                  data.data[0],
+              type:event.detail.file.type,
+              isImage:true,
+            });
+          }else{
+            that.fileList.push({
+              imgUrl: "/FileController/download/" + data.data[0],
+              id: data.data[0],
+              url:
+                  that.$constant.BASE_URI +
+                  "/FileController/download/" +
+                  data.data[0],
+              type:event.detail.file.type,
+              isVideo:true
+            });
+          }
         },
         fail(res) {},
       });
@@ -156,7 +243,7 @@ export default {
 }
 </script>
 <style lang="scss">
-.addRepair{
+.reportRepair{
   .reportBody{
     margin-top: 24rpx;
     padding: 38rpx 36rpx;
@@ -189,15 +276,18 @@ export default {
         padding: 32rpx 0;
         border-bottom: 2rpx solid #E6E6E6;
         .liInfo{
-          display: inline-block;
-          text-align: right;
+          display: flex;
+          justify-content: flex-end;
+          gap: 0 64prx;
           max-width: 428rpx;
           color: rgba(102, 102, 102, 1);
           font-size: 32rpx;
           line-height: 38rpx;
-          .radio{
-            margin-left: 64rpx;
-          }
+        }
+        .van-radio-group{
+          display: flex;
+          align-items: center;
+          gap: 0 32rpx;
         }
       }
       .detailLi2{

pages/subPackages/todo/dispatch.vue

@@ -4,7 +4,7 @@
       <ul class="detailUl">
         <li class="detailLi">
           <span class="liName">当前企业</span>
-          <span class="liInfo">无锡XXXXX有限公司</span>
+          <span class="liInfo">{{ detail.companyName }}</span>
         </li>
         <li class="detailLi">
           <span class="liName">
@@ -12,12 +12,10 @@
             您是想
           </span>
           <span class="liInfo">
-              <label class="radio"  @click.stop="isCheck=true" >
-                  <radio value="报事" :checked="isCheck" color="#0365F9"/>报事
-              </label>
-              <label class="radio" @click.stop="isCheck=false" >
-                  <radio value="咨询" :checked="!isCheck" color="#0365F9"/>咨询
-               </label>
+             <van-radio-group :value="detail.type" disabled>
+                  <van-radio name="1">报事</van-radio>
+                  <van-radio name="2">咨询</van-radio>
+             </van-radio-group>
           </span>
         </li>
         <li class="detailLi2">
@@ -26,16 +24,17 @@
           </span>
           <div class="detailLi2Box">
             <div class="detailLi2BoxTop">
-              <div class="checkItem" :class="item.isCheck?'checked':''" v-for="item in checkList" @click="clickCheck(item)">{{item.name}}</div>
+              <div class="checkItem" :class="detail.serviceType===item.label?'checked':''" v-for="item in checkList">{{item.label}}</div>
             </div>
             <van-field
-                :value="form.contant"
+                :value="detail.description"
                 autosize
                 type="textarea"
                 placeholder="请输入文字进行报事报修描述"
                 class="myField"
                 maxlength="800"
                 show-word-limit
+                readonly
             />
           </div>
         </li>
@@ -45,12 +44,10 @@
             位置
           </span>
           <span class="liInfo">
-              <label class="radio"  @click.stop="isCheck2=true" >
-                  <radio value="报事" :checked="isCheck2" color="#0365F9"/>室内
-              </label>
-              <label class="radio" @click.stop="isCheck2=false" >
-                  <radio value="咨询" :checked="!isCheck2" color="#0365F9"/>公区
-               </label>
+             <van-radio-group :value="detail.position" disabled>
+                <van-radio name="1">室内</van-radio>
+                <van-radio name="2">公区</van-radio>
+             </van-radio-group>
           </span>
         </li>
         <li class="detailLi2">
@@ -58,14 +55,26 @@
             补充说明
             <span style="color: #B3B3B3;font-size: 28rpx">（支持图片/视频上传限20M内，最多6张）</span>
           </span>
-          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
-            <van-uploader
-                :max-count="6"
-                @delete="deleteRYXXZP"
-                :file-list="fileList"
-                @after-read="uploadRYXXZP"
-                :show-upload="true"
-            />
+
+          <div style="display: flex;flex-wrap: wrap;gap: 24rpx">
+            <div class="detailLi2Box annex-item"
+                 style="margin: 24rpx 0 0 0"
+                 v-for="(item, index) in explainAnnexList"
+                 :key="index">
+                 <img :src="item.url" alt="" v-if="item.type === 'image'" class="anImg" @tap="clickImg(item.url)"/>
+             </div>
+          </div>
+          <div class="detailLi2Box annex-item"
+               style="margin: 24rpx 0 0 0"
+               v-for="(item, index) in explainAnnexList"
+               :key="index+999">
+            <video
+                :src="item.url"
+                v-if="item.type === 'video'"
+                style="width: 686rpx"
+                height="100%"
+                autoplay
+            ></video>
           </div>
         </li>
         <li class="detailLi">
@@ -73,7 +82,7 @@
             报事人
           </span>
           <span class="liInfo">
-            章敏-18915281562 <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
+            {{detail.userName}} <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
           </span>
         </li>
         <li class="detailLi" style="border-bottom: none">
@@ -81,70 +90,68 @@
             报事时间
           </span>
           <span class="liInfo">
-            2024-05-16  15：30
+            {{detail.createdAt}}
           </span>
         </li>
       </ul>
     </div>
     <div class="handleBox">
-       <div class="handleTitle">处理情况</div>
-       <div class="imageBox">
-         <div class="imageItem">
-           <img src="https://www.idea-co-sf.com/gardenProduct/image/upImage.svg" class="handleImg">
-           <span>上报</span>
-         </div>
-         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
-         <div class="imageItem">
-            <img src="https://www.idea-co-sf.com/gardenProduct/image/acceptance.svg" class="handleImg">
-            <span>受理</span>
-         </div>
-         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
-         <div class="imageItem">
-             <img :src="optionsType==='待受理'?'https://www.idea-co-sf.com/gardenProduct/image/unHandle.svg':'https://www.idea-co-sf.com/gardenProduct/image/handle.svg'" class="handleImg">
-             <span>处理</span>
-         </div>
-         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
-         <div class="imageItem">
-            <img src="https://www.idea-co-sf.com/gardenProduct/image/evaluate.svg" class="handleImg">
-            <span>评价</span>
-         </div>
-       </div>
+      <div class="handleTitle">处理情况</div>
+      <div class="imageBox">
+        <div class="imageItem">
+          <img src="https://www.idea-co-sf.com/gardenProduct/image/upImage.svg" class="handleImg">
+          <span>上报</span>
+        </div>
+        <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
+        <div class="imageItem">
+          <img :src="stepActive==='已受理'||stepActive==='已处理'?'https://www.idea-co-sf.com/gardenProduct/image/acceptance.svg':'https://www.idea-co-sf.com/gardenProduct/image/unAcceptance.svg'" class="handleImg">
+          <span>受理</span>
+        </div>
+        <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
+        <div class="imageItem">
+          <img :src="stepActive==='已处理'?'https://www.idea-co-sf.com/gardenProduct/image/handle.svg':'https://www.idea-co-sf.com/gardenProduct/image/unHandle.svg'" class="handleImg">
+          <span>处理</span>
+        </div>
+        <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
+        <div class="imageItem">
+          <img src="https://www.idea-co-sf.com/gardenProduct/image/evaluate.svg" class="handleImg">
+          <span>评价</span>
+        </div>
+      </div>
     </div>
-    <div class="reportBody" v-if="optionsType!=='已处理'">
+
+    <div class="reportBody" v-if="stepActive!=='已处理'">
       <ul class="detailUl">
         <li class="detailLi">
            <span class="liInfo">
-              <label>
-                  <radio value="报事" :checked="optionsType==='待受理'" color="#0365F9" :disabled="optionsType==='待处理'"/>派单
-              </label>
-              <label style="margin-left: 64rpx">
-                  <radio value="咨询" :checked="optionsType==='待处理'" color="#0365F9" :disabled="optionsType==='待受理'"/>处理
-               </label>
+             <van-radio-group :value="optionsType" :disabled="stepActive==='已处理'||stepActive==='已受理'" @change="changeHandle">
+                <van-radio name="1">派单</van-radio>
+                <van-radio name="2">处理</van-radio>
+             </van-radio-group>
           </span>
         </li>
-        <li class="detailLi" v-if="optionsType==='待受理'">
+        <li class="detailLi" v-if="optionsType==='1'">
           <span class="liName">
             派单给
           </span>
-          <span class="liInfo">
-            李开心
-          </span>
+          <input v-model="handler" class="liInfo" @click="showPicker = true" placeholder="请选择" disabled />
         </li>
-        <li class="detailLi2" v-if="optionsType==='待受理'">
+        <li class="detailLi2" v-if="optionsType==='1'">
            <span class="liName" style="margin-bottom: 16rpx">
             备注
           </span>
-            <van-field
-                :value="form.contant"
-                autosize
-                type="textarea"
-                placeholder="请输入文字进行报事报修描述"
-                class="myField2"
-                maxlength="800"
-                show-word-limit
-            />
+          <van-field
+              :value="params.contant"
+              autosize
+              type="textarea"
+              placeholder="请输入文字进行报事报修描述"
+              class="myField2"
+              maxlength="800"
+              show-word-limit
+              @change="changeRemark"
+          />
         </li>
-        <li class="detailLi2" v-if="optionsType==='待处理'">
+        <li class="detailLi2" v-if="optionsType==='2'">
           <span class="liName">
             处理后拍照
             <span style="color: #B3B3B3;font-size: 28rpx">（支持图片上传限20M内，最多6张）</span>
@@ -159,15 +166,15 @@
             />
           </div>
         </li>
-        <li class="detailLi" v-if="optionsType==='待处理'">
+        <li class="detailLi" v-if="optionsType==='2'">
           <span class="liName">
             处理人
           </span>
           <span class="liInfo">
-            李开心
+            {{getUserLocalStorageInfo.username}}
           </span>
         </li>
-        <li class="detailLi" v-if="optionsType==='待处理'" style="border-bottom: none">
+        <li class="detailLi" v-if="optionsType==='2'" style="border-bottom: none">
           <span class="liName">
             处理时间
           </span>
@@ -177,7 +184,16 @@
         </li>
       </ul>
     </div>
-    <div class="reportBody" v-if="optionsType==='已处理'">
+    <van-popup :show="showPicker" position="bottom">
+      <van-picker
+          class="picker-box"
+          show-toolbar
+          :columns="dispatchPerson"
+          @confirm="(value) => onSelect(value)"
+          @cancel="showPicker = false"
+      />
+    </van-popup>
+    <div class="reportBody" v-if="stepActive==='已处理'||stepActive==='已受理'">
       <div class="handleTitle">派单信息</div>
       <ul class="detailUl">
         <li class="detailLi">
@@ -185,29 +201,28 @@
             派单给
           </span>
           <span class="liInfo">
-            李开心
+            {{detail.handleUserName}}
           </span>
         </li>
         <li class="detailLi2">
            <span class="liName" style="margin-bottom: 16rpx">
             备注
           </span>
-            <van-field
-                :value="form.contant"
-                autosize
-                type="textarea"
-                placeholder="请输入文字进行报事报修描述"
-                class="myField2"
-                maxlength="800"
-                show-word-limit
-            />
+          <van-field
+              :value="detail.remark"
+              autosize
+              type="textarea"
+              placeholder=""
+              class="myField2"
+              readonly
+          />
         </li>
         <li class="detailLi">
           <span class="liName">
             派单人
           </span>
           <span class="liInfo">
-            李欣怡
+            {{detail.dispatchUserName}}
           </span>
         </li>
         <li class="detailLi" style="border-bottom: none">
@@ -215,12 +230,12 @@
             派单时间
           </span>
           <span class="liInfo">
-            2024-05-18  15：30
+            {{detail.dispatchTime}}
           </span>
         </li>
       </ul>
     </div>
-    <div class="reportBody" v-if="optionsType==='已处理'">
+    <div class="reportBody" v-if="stepActive==='已处理'">
       <div class="handleTitle">处理信息</div>
       <ul class="detailUl">
         <li class="detailLi2">
@@ -228,14 +243,13 @@
             处理后拍照
             <span style="color: #B3B3B3;font-size: 28rpx">（支持图片上传限20M内，最多6张）</span>
           </span>
-          <div class="detailLi2Box" style="margin: 24rpx 0 0 0">
-            <van-uploader
-                :max-count="6"
-                @delete="deleteRYXXZP"
-                :file-list="fileList"
-                @after-read="uploadRYXXZP"
-                :show-upload="true"
-            />
+          <div style="display: flex;flex-wrap: wrap;gap: 24rpx">
+            <div class="detailLi2Box annex-item"
+                 style="margin: 24rpx 0 0 0;"
+                 v-for="(item, index) in handleUrlList"
+                 :key="index">
+                  <img :src="item.url" alt="" class="anImg" @tap="clickImg(item.url)"/>
+            </div>
           </div>
         </li>
         <li class="detailLi">
@@ -243,7 +257,7 @@
             处理人
           </span>
           <span class="liInfo">
-            李开心
+            {{detail.handleUserName}}
           </span>
         </li>
         <li class="detailLi" style="border-bottom: none">
@@ -251,49 +265,91 @@
             处理时间
           </span>
           <span class="liInfo">
-            2024-05-18  15：30
+            {{detail.handleTime}}
           </span>
         </li>
       </ul>
     </div>
+    <div class="reportBody" v-if="stepActive==='已处理'">
+      <div class="evaluationBox" >
+        <span class="evaName">您对本次服务的评价</span>
+        <van-rate
+            :value="value"
+            :size="24"
+            gutter="32rpx"
+            void-color="#eee"
+            bind:change="onChange"
+            color="#fd9a63"
+        />
+      </div>
+    </div>
     <div class="buttonBox">
-      <button class="zcBtn" @tap="closePage" :class="optionsType==='已处理'?'btn2':'btn '">关闭</button>
-      <button class="btn tjBtn" v-if="optionsType==='待受理'">提交派单</button>
-      <button class="btn tjBtn" v-if="optionsType==='待处理'">处理完成</button>
+      <button class="zcBtn" @tap="closePage" :class="stepActive==='已处理'?'btn2':'btn '">关闭</button>
+      <button class="btn tjBtn" v-if="stepActive!=='已处理'" @tap="onConfirm">提交</button>
     </div>
   </div>
 </template>
 <script>
+import {getRepairDispatchById,getUserLocalStorageInfo,getByCodes,getDispatchToPerson, editRepair} from "@/js_sdk/http";
 export default {
   data(){
     return{
+      getUserLocalStorageInfo:getUserLocalStorageInfo(),
+      showPicker:false,
+      dc_key: ['QUICK_SELECTION'],
       isCheck:false,
       isCheck2:false,
-      form:{
-        contant:''
+      detail:{
       },
       checkList:[
-        {name:'挂件安装',isCheck:true},
-        {name:'我要投诉',isCheck:false},
-        {name:'疏通管道',isCheck:false},
-        {name:'维修线路',isCheck:false},
-        {name:'更换灯泡',isCheck:false},
-        {name:'网络维修',isCheck:false},
-        {name:'保洁服务',isCheck:false},
-        {name:'其他维修',isCheck:false},
+        // {name:'挂件安装',isCheck:true},
+        // {name:'我要投诉',isCheck:false},
+        // {name:'疏通管道',isCheck:false},
+        // {name:'维修线路',isCheck:false},
+        // {name:'更换灯泡',isCheck:false},
+        // {name:'网络维修',isCheck:false},
+        // {name:'保洁服务',isCheck:false},
+        // {name:'其他维修',isCheck:false},
       ],
       fileList:[],
-      optionsType:'',
-      timeNow:''
+      optionsType:'2',
+      timeNow:'',
+      value: "5",
+      id:'',
+      dic_SelectList:[],
+      explainAnnexList:[],
+      processedAnnexList:[],
+      stepActive:'0',
+      dispatchPerson:[],
+      params: {
+        id: '',
+        status: 'acceptance',
+        dispatchUserId:getUserLocalStorageInfo().userId,
+        dispatchUserName: getUserLocalStorageInfo().username,
+        handleUserName:'',
+        dispatchTime: this.$common.transServDate(new Date()),
+        handleUserId: '',
+        remark: '',
+      },
+      handleParams:{
+        id: '',
+        status: 'processed',
+        handleUrl:'',
+        handleTime:'',
+        handleUserId:getUserLocalStorageInfo().userId,
+        handleUserName: getUserLocalStorageInfo().username,
+      },
+      handler:'',
+      handleUrlList:[]
     }
   },
   onLoad(options) {
-    console.log(options);
-    this.optionsType = options.type
+    const item = JSON.parse(options.item)
+    this.id = item.id
     if (options.type==='待处理'){
-        uni.setNavigationBarTitle({
-          title: '报修处理',
-        });
+      uni.setNavigationBarTitle({
+        title: '报修处理',
+      });
     }else if(options.type==='已处理'){
       uni.setNavigationBarTitle({
         title: '报修详情',
@@ -303,21 +359,141 @@ export default {
         title: '报修派单',
       });
     }
+    this.getByCodes()
   },
   mounted(){
     this.getTime()
+    this.getDispatch()
   },
   methods:{
-    // toRecord() {
-    //   uni.navigateTo({
-    //     url:'/pages/subPackages/reportRepair/repairRecord'
-    //   })
-    // },
-    getTime(){
+    onConfirm(value) {
+      // console.log(this.optionsType)
+      if(this.optionsType=='1'){
+        if (this.params.handleUserId == null || this.params.handleUserId === '') {
+          uni.showToast({
+            title: '请选择处理人',
+            icon: 'none',
+            mask: true,
+            duration: 1000
+          });
+          return
+        }
+        this.params.id = this.id
+        console.log('this.params',this.params)
+        editRepair(this.params).then((res) => {
+          if (res.code === 200) {
+            uni.showToast({
+              title: '派单成功',
+              icon: 'none',
+              mask: true,
+              duration: 1000
+            });
+            uni.navigateBack({})
+          }else{
+            uni.showToast({
+              title: res.msg,
+              icon: 'none',
+              mask: true,
+              duration: 1000
+            });
+          }
+        })
+      }else {
+        if ( this.fileList.length<=0 || !this.fileList ){
+          uni.showToast({
+            title: '请上传处理图片',
+            icon: 'none',
+            mask: true,
+            duration: 1000
+          });
+          return
+        }
+        this.handleParams.id = this.id
+        this.handleParams.handleUrl = JSON.stringify(this.fileList)
+        this.handleParams.handleTime= this.getTime()
+        // console.log('this.handleParams',this.handleParams)
+        editRepair(this.handleParams).then((res) => {
+          if (res.code === 200) {
+            uni.showToast({
+              title: '处理成功',
+              icon: 'none',
+              mask: true,
+              duration: 1000
+            });
+            uni.navigateBack({})
+          }else{
+            uni.showToast({
+              title: res.msg,
+              icon: 'none',
+              mask: true,
+              duration: 1000
+            });
+          }
+        })
+      }
 
+    },
+    changeRemark(e){
+      this.params.remark = e.detail
+    },
+    onSelect(val){
+      // console.log('val',val.detail.value.text)
+      this.handler = val.detail.value.text
+      this.params.handleUserId = val.detail.value.value
+      this.params.handleUserName = val.detail.value.text
+      this.showPicker = false
+    },
+    changeHandle(e){
+      // console.log(e)
+      this.optionsType = e.detail
+    },
+    getDispatch(){
+      getDispatchToPerson({}).then(res=>{
+         this.dispatchPerson = res.data
+      })
+    },
+    // 放大图片
+    clickImg(url) {
+      wx.previewImage({
+        urls: [url], //接受的是一个数组，默认展示第一张
+        current: "",
+        success: function (res) {
+        },
+        fail: function (res) {
+        },
+        complete: function (res) {
+        },
+      })
+    },
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dc_key));
+      this.dic_SelectList = this.$common.handleDicList(data);
+      this.checkList = this.dic_SelectList.QUICK_SELECTION
+      this.getById()
+    },
+    getById(){
+      const _this = this
+      getRepairDispatchById(this.id).then(res=>{
+        if (res.data) {
+          const det = _this.getItemJson(res.data)
+          this.detail = det
+          // console.log('this.detail',this.detail)
+          this.explainAnnexList = det.fileUrlList
+          this.handleUrlList = det.handleUrlList
+          this.processedAnnexList = det.handleUrlList
+          this.detailStatus = det.status
+          // this.params = {
+          //   id: det.id,
+          //   evaluateNum: det.evaluateNum,
+          //   score: det.score
+          // }
+          // this.evaluateVal = ((det.score == null ? 0 : det.score) / (det.evaluateNum == null ? 1 : det.evaluateNum))
+        }
+      })
+    },
+    getTime(){
       let timestamp = new Date().getTime();
       let dateStr = new Date().toLocaleDateString();
-      console.log(dateStr);
 
       let date = new Date();
       let year = date.getFullYear();
@@ -325,24 +501,106 @@ export default {
       let day = date.getDate();
       let hours = date.getHours();
       let minutes = date.getMinutes();
-      let fullDateStr = `${year}-${month}-${day} ${hours}:${minutes}`;
+      let fullDateStr = `${year}-${month}-${day} ${hours}:${minutes < 10 ? '0' + minutes : minutes}`;
       console.log(fullDateStr);
       this.timeNow = fullDateStr
+      return fullDateStr
     },
-    closePage() {
-      uni.navigateTo({
-        url:'/pages/subPackages/todo/repairAcceptance'
-      })
+
+    getItemJson: function(item) {
+      item.releaseTime = this.$common.transDate(item.releaseTime)
+      item.createdAt = this.$common.transDate(item.createdAt)
+
+      let transformedObject = this.dic_SelectList.QUICK_SELECTION.reduce((acc, obj) => {
+        acc[obj.value] = obj.label;
+        return acc;
+      }, {});
+
+      item.serviceType = transformedObject[item.serviceType]
+      if (item.userId) {
+        const user = item.userId.split('-')
+        item.userPhone = user[1] + '-' + user[2]
+        item.phone = user[2]
+      }
+      if (item.handleUserId) {
+        const test = item.handleUserId.split('-')
+        item.handleUserId = test[1] + '-' + test[2]
+        item.hanleUserPhone = test[2]
+      }
+      // item.handleTime = this.$common.transDate(item.handleTime)
+      switch (item.status) {
+        case 'unAcceptance':
+          this.stepActive = '待受理'
+          break
+        case 'acceptance':
+          this.stepActive = '已受理'
+          break
+        case 'processed':
+          this.stepActive = '已处理'
+          break
+        case 'unSubmit':
+          this.stepActive = '暂存'
+          break
+      }
+      if (item.fileUrl){
+        // console.log('item.fileUrl' ,JSON.parse(item.fileUrl))
+        const fileUrl = JSON.parse(item.fileUrl)
+        const newFile = []
+        fileUrl.forEach((e=>{
+              newFile.push({
+                imgUrl: e.imgUrl,
+                id: e.id,
+                url: e.url,
+                type: e.type,
+              });
+            })
+        )
+        // console.log('newFile',newFile)
+        item.fileUrlList = newFile
+      }
+      if (item.handleUrl ){
+        // console.log('item.fileUrl' ,JSON.parse(item.fileUrl))
+        const fileUrl = JSON.parse(item.handleUrl)
+        const newFile = []
+        fileUrl.forEach((e=>{
+              newFile.push({
+                imgUrl: e.imgUrl,
+                id: e.id,
+                url: e.url,
+                type: e.type,
+              });
+            })
+        )
+        // console.log('newFile',newFile)
+        item.handleUrlList = newFile
+      }
+
+      const handleUrls = JSON.parse(item.handleUrl)
+      const handleUrl = []
+      if (handleUrls !== null && handleUrls.length > 0) {
+        handleUrls.forEach(item => {
+          if (item.url) {
+            const ul = {
+              type: 'image',
+              url: item.url.replace('/server', '/smartParkH5Server')
+            }
+            handleUrl.push(ul)
+          }
+        })
+      }
+      item.handleUrlList = handleUrl
+      console.log('item',item)
+      return item
     },
-    clickCheck(item){
-      item.isCheck = !item.isCheck
+    closePage() {
+      uni.navigateBack({})
     },
     deleteRYXXZP(event) {
       this.fileList.splice(event.detail.index, 1);
       this.$forceUpdate();
     },
     uploadRYXXZP(event) {
-      console.log(event)
+      // console.log(event)
       let that = this;
       const { file } = event.detail;
       uni.uploadFile({
@@ -411,15 +669,17 @@ export default {
           line-height: 38rpx;
           display: flex;
           align-items: center;
-          .radio{
-            margin-left: 64rpx;
-          }
           .phoneIcon{
             width: 64rpx;
             height: 64rpx;
             margin-left: 24rpx;
           }
         }
+        .van-radio-group{
+          display: flex;
+          align-items: center;
+          gap: 0 32rpx;
+        }
       }
       .detailLi2{
         display: flex;
@@ -451,6 +711,10 @@ export default {
       }
     }
   }
+  .anImg{
+    width: 200rpx;
+    height: 200rpx;
+  }
   .van-cell {
     background: #F5F7FA !important;
     border-radius: 8rpx;
@@ -526,5 +790,21 @@ export default {
     font-size: 36rpx;
     font-weight: 600;
   }
+  .evaluationBox {
+    width: 686rpx;
+    height: 100rpx;
+    padding: 0 24rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background: #f5f7fa;
+    border-radius: 8rpx;
+    box-sizing: border-box;
+    margin-top: 24rpx;
+    .evaName{
+      font-size: 32rpx;
+      color: rgba(51, 51, 51, 1);
+    }
+  }
 }
 </style>

pages/subPackages/todo/index.vue

@@ -10,11 +10,13 @@
 </template>
 
 <script>
+import { getUserLocalStorageInfo } from "@/js_sdk/http";
 export default {
   components: {
   },
   data() {
     return {
+      getUserLocalStorageInfo: getUserLocalStorageInfo(),
       todoList:[
         {name:'2024年01月26日~2024年...',tag:'企业房源预定'},
         {name:'空调坏了，不能使用',tag:'报事报修-派单'},

pages/subPackages/todo/repairAcceptance.vue

@@ -2,34 +2,79 @@
     <div class="repairAcceptance">
       <div class="whiteBoard">
         <div class="addRepair" @tap="addRepair">新增报修 <van-icon name="add" style="margin-left: 8rpx"/></div>
-        <div class="repairItem" v-for="item in repairList" @click="toDetail(item)">
+        <div class="repairItem" v-for="item in recordList" @click="toDetail(item)">
           <div class="repairItemTitleRow">
-            <span class="titleName">{{item.name}}</span>
-            <span class="titleTag" :class="item.type==='待处理'?'titleTag2':item.type==='已处理'?'titleTag3':'titleTag'">{{item.type}}</span>
+            <span class="titleName">{{item.description}}</span>
+            <span class="titleTag" :class="item.statusName==='已受理'?'titleTag2':item.type==='已处理'?'titleTag3':'titleTag'">{{item.statusName}}</span>
           </div>
           <div class="companyBox">
             <img src="https://www.idea-co-sf.com/gardenProduct/image/gs.svg" class="gsIcon">
-            <span class="companyName">无锡 XXXX有限公司</span>
+            <span class="companyName">{{item.companyName}}</span>
           </div>
-          <div class="upTimeBox">上报时间：2021-1-21  13:00</div>
+          <div class="upTimeBox">上报时间：{{ item.createdAt }}</div>
         </div>
       </div>
     </div>
 </template>
 
 <script>
+import { repairList,getUserLocalStorageInfo,getByCodes } from "@/js_sdk/http";
 export default {
   name: "repairAcceptance",
   data(){
     return{
-      repairList:[
-        {name:'上月水费不太对，怀疑水表异常',type:'待受理'},
-        {name:'空调坏了，不能使用',type:'待处理'},
-        {name:'空调坏了，不能使用',type:'已处理'},
-      ]
+      dc_key: ['REPAIR_STATUS'],
+      getUserLocalStorageInfo: getUserLocalStorageInfo(),
+      recordList:[
+        // {name:'上月水费不太对，怀疑水表异常',type:'待受理'},
+        // {name:'空调坏了，不能使用',type:'待处理'},
+        // {name:'空调坏了，不能使用',type:'已处理'},
+      ],
+      params: {
+        pageNum: 1,
+        pageSize: 10,
+        dispatchUserId: getUserLocalStorageInfo().userId,
+        handleUserId: getUserLocalStorageInfo().userId,
+      },
+      checkList:[]
     }
   },
+  onShow(){
+    this.getByCodes()
+  },
+  mounted(){
+  },
   methods:{
+    onPullDownRefresh() {
+      this.getByCodes()
+      setTimeout(function () {
+        uni.stopPullDownRefresh();
+      }, 1000);
+    },
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dc_key));
+      this.dic_SelectList = this.$common.handleDicList(data);
+      this.checkList = this.dic_SelectList.REPAIR_STATUS
+      this.getList()
+    },
+    getList(){
+      this.recordList = []
+      const _this = this
+      repairList(this.params).then((res) => {
+        if (res.code=='409'){
+          uni.clearStorageSync();
+          uni.reLaunch({
+            url: "/pages/login/login",
+          });
+        }
+        if (res.data) {
+          res.data.forEach(function(item) {
+            const jsonMap = _this.getItemJson(item)
+            _this.recordList.push(jsonMap)
+          })
+        }
+      })
+    },
     addRepair(){
       uni.navigateTo({
         url:'/pages/subPackages/todo/addRepair'
@@ -37,9 +82,19 @@ export default {
     },
     toDetail(item) {
       uni.navigateTo({
-        url:'/pages/subPackages/todo/dispatch?type=' + item.type
+        url:'/pages/subPackages/todo/dispatch?item=' + JSON.stringify(item)
       })
-    }
+    },
+    getItemJson: function(item) {
+      item.createdAt = this.$common.transServDate(item.createdAt)
+      let transformedObject = this.checkList.reduce((acc, obj) => {
+        acc[obj.value] = obj.label;
+        return acc;
+      }, {});
+
+      item.statusName = transformedObject[item.status]
+      return item
+    },
   }
 }
 </script>
@@ -51,7 +106,7 @@ export default {
         margin-top: 24rpx;
         box-sizing: border-box;
         padding: 32rpx;
-        height: 1424rpx;
+        min-height: 1424rpx;
         .addRepair{
           display: flex;
           justify-content: flex-end;

pages/utils/constant.js

@@ -4,7 +4,7 @@ export const BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi'
 // export const BASE_URI = "http://192.168.3.94:9010"; // 老潘本地
 // export const BASE_URI = "http://192.168.2.107:9011"; // 洮洮本地
 // export const BASE_URI = "http://192.168.2.103:9010"; // 老崔本地
-// export const BASE_URI = "http://192.168.2.110:9015"; // 许峰本地
+// export const BASE_URI = "http://192.168.2.111:9015"; // 许峰本地
 // export const BASE_URI = "http://192.168.2.112:9010"; // 陈凡本地
 
 export default {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -58,7 +58,7 @@ module.exports = _nonIterableRest, module.exports.__esModule = true, module.expo
 
 /***/ }),
 
-/***/ 1011:
+/***/ 1015:
 /*!********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/popup/index.js ***!
   \********************************************************************/
@@ -68,8 +68,8 @@ module.exports = _nonIterableRest, module.exports.__esModule = true, module.expo
 "use strict";
 
 
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _transition = __webpack_require__(/*! ../mixins/transition */ 1012);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _transition = __webpack_require__(/*! ../mixins/transition */ 1016);
 (0, _component.VantComponent)({
   classes: ['enter-class', 'enter-active-class', 'enter-to-class', 'leave-class', 'leave-active-class', 'leave-to-class', 'close-icon-class'],
   mixins: [(0, _transition.transition)(false)],
@@ -162,7 +162,7 @@ var _transition = __webpack_require__(/*! ../mixins/transition */ 1012);
 
 /***/ }),
 
-/***/ 1012:
+/***/ 1016:
 /*!**************************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/mixins/transition.js ***!
   \**************************************************************************/
@@ -176,8 +176,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transition = transition;
-var _utils = __webpack_require__(/*! ../common/utils */ 779);
-var _validator = __webpack_require__(/*! ../common/validator */ 780);
+var _utils = __webpack_require__(/*! ../common/utils */ 783);
+var _validator = __webpack_require__(/*! ../common/validator */ 784);
 // @ts-nocheck
 
 var getClassNames = function getClassNames(name) {
@@ -316,7 +316,7 @@ function transition(showDefaultValue) {
 
 /***/ }),
 
-/***/ 1013:
+/***/ 1017:
 /*!********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/field/index.js ***!
   \********************************************************************/
@@ -326,9 +326,9 @@ function transition(showDefaultValue) {
 "use strict";
 
 
-var _utils = __webpack_require__(/*! ../common/utils */ 779);
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _props = __webpack_require__(/*! ./props */ 1014);
+var _utils = __webpack_require__(/*! ../common/utils */ 783);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _props = __webpack_require__(/*! ./props */ 1018);
 (0, _component.VantComponent)({
   field: true,
   classes: ['input-class', 'right-icon-class', 'label-class'],
@@ -504,7 +504,7 @@ var _props = __webpack_require__(/*! ./props */ 1014);
 
 /***/ }),
 
-/***/ 1014:
+/***/ 1018:
 /*!********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/field/props.js ***!
   \********************************************************************/
@@ -590,7 +590,7 @@ exports.textareaProps = textareaProps;
 
 /***/ }),
 
-/***/ 1020:
+/***/ 1024:
 /*!*********************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-icons/components/uni-icons/icons.js ***!
   \*********************************************************************************/
@@ -1612,7 +1612,18 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 1056:
+/***/ 106:
+/*!****************************************************!*\
+  !*** D:/project/product_wx/static/mine/banner.png ***!
+  \****************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+module.exports = "/static/mine/banner.png";
+
+/***/ }),
+
+/***/ 1060:
 /*!**********************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js ***!
   \**********************************************************************************************/
@@ -1627,9 +1638,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 1057));
-var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 1058));
-var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 1059));
+var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 1061));
+var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 1062));
+var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 1063));
 var _default = {
   en: _en.default,
   'zh-Hans': _zhHans.default,
@@ -1639,7 +1650,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 1057:
+/***/ 1061:
 /*!*********************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json ***!
   \*********************************************************************************************/
@@ -1650,7 +1661,7 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"Pull up to show mo
 
 /***/ }),
 
-/***/ 1058:
+/***/ 1062:
 /*!**************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json ***!
   \**************************************************************************************************/
@@ -1661,7 +1672,7 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉显示更多
 
 /***/ }),
 
-/***/ 1059:
+/***/ 1063:
 /*!**************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json ***!
   \**************************************************************************************************/
@@ -1672,18 +1683,7 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉顯示更多
 
 /***/ }),
 
-/***/ 106:
-/*!****************************************************!*\
-  !*** D:/project/product_wx/static/mine/banner.png ***!
-  \****************************************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-module.exports = "/static/mine/banner.png";
-
-/***/ }),
-
-/***/ 1062:
+/***/ 1066:
 /*!******************************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/datetime-picker/index.js ***!
   \******************************************************************************/
@@ -1696,9 +1696,9 @@ module.exports = "/static/mine/banner.png";
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ 5));
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _validator = __webpack_require__(/*! ../common/validator */ 780);
-var _shared = __webpack_require__(/*! ../picker/shared */ 944);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _validator = __webpack_require__(/*! ../common/validator */ 784);
+var _shared = __webpack_require__(/*! ../picker/shared */ 948);
 var currentYear = new Date().getFullYear();
 function isValidDate(date) {
   return (0, _validator.isDef)(date) && !isNaN(new Date(date).getTime());
@@ -2025,7 +2025,7 @@ var defaultFormatter = function defaultFormatter(type, value) {
 
 /***/ }),
 
-/***/ 1063:
+/***/ 1067:
 /*!*********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/button/index.js ***!
   \*********************************************************************/
@@ -2035,9 +2035,9 @@ var defaultFormatter = function defaultFormatter(type, value) {
 "use strict";
 /* WEBPACK VAR INJECTION */(function(wx) {
 
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _button = __webpack_require__(/*! ../mixins/button */ 1064);
-var _version = __webpack_require__(/*! ../common/version */ 773);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _button = __webpack_require__(/*! ../mixins/button */ 1068);
+var _version = __webpack_require__(/*! ../common/version */ 777);
 var mixins = [_button.button];
 if ((0, _version.canIUseFormFieldButton)()) {
   mixins.push('wx://form-field-button');
@@ -2108,7 +2108,7 @@ if ((0, _version.canIUseFormFieldButton)()) {
 
 /***/ }),
 
-/***/ 1064:
+/***/ 1068:
 /*!**********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/mixins/button.js ***!
   \**********************************************************************/
@@ -2122,7 +2122,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.button = void 0;
-var _version = __webpack_require__(/*! ../common/version */ 773);
+var _version = __webpack_require__(/*! ../common/version */ 777);
 var button = Behavior({
   externalClasses: ['hover-class'],
   properties: {
@@ -2170,7 +2170,7 @@ exports.button = button;
 
 /***/ }),
 
-/***/ 1065:
+/***/ 1069:
 /*!**********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/divider/index.js ***!
   \**********************************************************************/
@@ -2180,7 +2180,7 @@ exports.button = button;
 "use strict";
 
 
-var _component = __webpack_require__(/*! ../common/component */ 774);
+var _component = __webpack_require__(/*! ../common/component */ 778);
 (0, _component.VantComponent)({
   props: {
     dashed: Boolean,
@@ -26393,7 +26393,7 @@ var BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi';
 // export const BASE_URI = "http://192.168.3.94:9010"; // 老潘本地
 // export const BASE_URI = "http://192.168.2.107:9011"; // 洮洮本地
 // export const BASE_URI = "http://192.168.2.103:9010"; // 老崔本地
-// export const BASE_URI = "http://192.168.2.110:9015"; // 许峰本地
+// export const BASE_URI = "http://192.168.2.111:9015"; // 许峰本地
 // export const BASE_URI = "http://192.168.2.112:9010"; // 陈凡本地
 exports.BASE_URI = BASE_URI;
 var _default = {
@@ -27663,7 +27663,7 @@ function findRectificationManagementInOutById(e) {
   }, {});
 }
 function repairList(data) {
-  return _requestConfig.default.post('/wx/repair/list', data, {});
+  return _requestConfig.default.post('/wx/repair/handleList', data, {});
 }
 function addSafetySelfCheckingManage(data) {
   return _requestConfig.default.post('/wx/SafetyController/addSafetySelfCheckingManage', data, {});
@@ -27686,7 +27686,7 @@ function getDispatchToPerson(data) {
   return _requestConfig.default.post('/wx/repair/getDispatchToPerson', data, {});
 }
 function getCompanyById(data) {
-  return _requestConfig.default.post('/wx/repair/getCompanyById', data, {});
+  return _requestConfig.default.post('/wx/roadShow/getCompanyById', data, {});
 }
 function getWxCompanyTags(e) {
   return _requestConfig.default.post('/wx/MnpTagInfoController/tagInfoList', e, {});
@@ -30008,7 +30008,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 772:
+/***/ 776:
 /*!********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/radio/index.js ***!
   \********************************************************************/
@@ -30018,9 +30018,9 @@ module.exports = {
 "use strict";
 
 
-var _version = __webpack_require__(/*! ../common/version */ 773);
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _relation = __webpack_require__(/*! ../common/relation */ 776);
+var _version = __webpack_require__(/*! ../common/version */ 777);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _relation = __webpack_require__(/*! ../common/relation */ 780);
 (0, _component.VantComponent)({
   field: true,
   relation: (0, _relation.useParent)('radio-group', function () {
@@ -30096,7 +30096,7 @@ var _relation = __webpack_require__(/*! ../common/relation */ 776);
 
 /***/ }),
 
-/***/ 773:
+/***/ 777:
 /*!***********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/common/version.js ***!
   \***********************************************************************/
@@ -30179,7 +30179,7 @@ function canIUseGetUserProfile() {
 
 /***/ }),
 
-/***/ 774:
+/***/ 778:
 /*!*************************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/common/component.js ***!
   \*************************************************************************/
@@ -30193,7 +30193,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VantComponent = VantComponent;
-var _basic = __webpack_require__(/*! ../mixins/basic */ 775);
+var _basic = __webpack_require__(/*! ../mixins/basic */ 779);
 function mapKeys(source, target, map) {
   Object.keys(map).forEach(function (key) {
     if (source[key]) {
@@ -30241,7 +30241,7 @@ function VantComponent(vantOptions) {
 
 /***/ }),
 
-/***/ 775:
+/***/ 779:
 /*!*********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/mixins/basic.js ***!
   \*********************************************************************/
@@ -30273,7 +30273,42 @@ exports.basic = basic;
 
 /***/ }),
 
-/***/ 776:
+/***/ 78:
+/*!****************************************!*\
+  !*** ./node_modules/qs/lib/formats.js ***!
+  \****************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var replace = String.prototype.replace;
+var percentTwenties = /%20/g;
+
+var Format = {
+    RFC1738: 'RFC1738',
+    RFC3986: 'RFC3986'
+};
+
+module.exports = {
+    'default': Format.RFC3986,
+    formatters: {
+        RFC1738: function (value) {
+            return replace.call(value, percentTwenties, '+');
+        },
+        RFC3986: function (value) {
+            return String(value);
+        }
+    },
+    RFC1738: Format.RFC1738,
+    RFC3986: Format.RFC3986
+};
+
+
+/***/ }),
+
+/***/ 780:
 /*!************************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/common/relation.js ***!
   \************************************************************************/
@@ -30354,7 +30389,7 @@ function useChildren(name, onEffect) {
 
 /***/ }),
 
-/***/ 777:
+/***/ 781:
 /*!**************************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/radio-group/index.js ***!
   \**************************************************************************/
@@ -30364,8 +30399,8 @@ function useChildren(name, onEffect) {
 "use strict";
 
 
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _relation = __webpack_require__(/*! ../common/relation */ 776);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _relation = __webpack_require__(/*! ../common/relation */ 780);
 (0, _component.VantComponent)({
   field: true,
   relation: (0, _relation.useChildren)('radio'),
@@ -30391,7 +30426,7 @@ var _relation = __webpack_require__(/*! ../common/relation */ 776);
 
 /***/ }),
 
-/***/ 778:
+/***/ 782:
 /*!*******************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/rate/index.js ***!
   \*******************************************************************/
@@ -30401,9 +30436,9 @@ var _relation = __webpack_require__(/*! ../common/relation */ 776);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(wx) {
 
-var _utils = __webpack_require__(/*! ../common/utils */ 779);
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _version = __webpack_require__(/*! ../common/version */ 773);
+var _utils = __webpack_require__(/*! ../common/utils */ 783);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _version = __webpack_require__(/*! ../common/version */ 777);
 (0, _component.VantComponent)({
   field: true,
   classes: ['icon-class'],
@@ -30500,7 +30535,7 @@ var _version = __webpack_require__(/*! ../common/version */ 773);
 
 /***/ }),
 
-/***/ 779:
+/***/ 783:
 /*!*********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/common/utils.js ***!
   \*********************************************************************/
@@ -30535,8 +30570,8 @@ exports.pickExclude = pickExclude;
 exports.range = range;
 exports.requestAnimationFrame = requestAnimationFrame;
 exports.toPromise = toPromise;
-var _validator = __webpack_require__(/*! ./validator */ 780);
-var _version = __webpack_require__(/*! ./version */ 773);
+var _validator = __webpack_require__(/*! ./validator */ 784);
+var _version = __webpack_require__(/*! ./version */ 777);
 function range(num, min, max) {
   return Math.min(Math.max(num, min), max);
 }
@@ -30609,42 +30644,7 @@ function getCurrentPage() {
 
 /***/ }),
 
-/***/ 78:
-/*!****************************************!*\
-  !*** ./node_modules/qs/lib/formats.js ***!
-  \****************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var replace = String.prototype.replace;
-var percentTwenties = /%20/g;
-
-var Format = {
-    RFC1738: 'RFC1738',
-    RFC3986: 'RFC3986'
-};
-
-module.exports = {
-    'default': Format.RFC3986,
-    formatters: {
-        RFC1738: function (value) {
-            return replace.call(value, percentTwenties, '+');
-        },
-        RFC3986: function (value) {
-            return String(value);
-        }
-    },
-    RFC1738: Format.RFC1738,
-    RFC3986: Format.RFC3986
-};
-
-
-/***/ }),
-
-/***/ 780:
+/***/ 784:
 /*!*************************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/common/validator.js ***!
   \*************************************************************************/
@@ -30997,7 +30997,7 @@ module.exports = _unsupportedIterableToArray, module.exports.__esModule = true,
 
 /***/ }),
 
-/***/ 800:
+/***/ 804:
 /*!**********************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js ***!
   \**********************************************************************************************************/
@@ -31012,9 +31012,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 801));
-var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 802));
-var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 803));
+var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 805));
+var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 806));
+var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 807));
 var _default = {
   en: _en.default,
   'zh-Hans': _zhHans.default,
@@ -31024,7 +31024,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 801:
+/***/ 805:
 /*!*********************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json ***!
   \*********************************************************************************************************/
@@ -31035,7 +31035,7 @@ module.exports = JSON.parse("{\"uni-datetime-picker.selectDate\":\"select date\"
 
 /***/ }),
 
-/***/ 802:
+/***/ 806:
 /*!**************************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json ***!
   \**************************************************************************************************************/
@@ -31046,7 +31046,7 @@ module.exports = JSON.parse("{\"uni-datetime-picker.selectDate\":\"选择日期\
 
 /***/ }),
 
-/***/ 803:
+/***/ 807:
 /*!**************************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json ***!
   \**************************************************************************************************************/
@@ -31057,7 +31057,7 @@ module.exports = JSON.parse("{\"uni-datetime-picker.selectDate\":\"選擇日期\
 
 /***/ }),
 
-/***/ 804:
+/***/ 808:
 /*!****************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js ***!
   \****************************************************************************************************/
@@ -31503,7 +31503,7 @@ function fixIosDateFormat(value) {
 
 /***/ }),
 
-/***/ 827:
+/***/ 831:
 /*!**************************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-file-picker/components/uni-file-picker/choose-and-upload-file.js ***!
   \**************************************************************************************************************/
@@ -31719,7 +31719,7 @@ function chooseAndUploadFile() {
 
 /***/ }),
 
-/***/ 828:
+/***/ 832:
 /*!*********************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-file-picker/components/uni-file-picker/utils.js ***!
   \*********************************************************************************************/
@@ -31883,7 +31883,7 @@ exports.get_file_data = get_file_data;
 
 /***/ }),
 
-/***/ 843:
+/***/ 847:
 /*!************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-forms/components/uni-forms/validate.js ***!
   \************************************************************************************/
@@ -32575,7 +32575,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 844:
+/***/ 848:
 /*!*********************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-forms/components/uni-forms/utils.js ***!
   \*********************************************************************************/
@@ -32911,7 +32911,7 @@ exports.isEqual = isEqual;
 
 /***/ }),
 
-/***/ 868:
+/***/ 872:
 /*!***********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/uploader/index.js ***!
   \***********************************************************************/
@@ -32921,10 +32921,10 @@ exports.isEqual = isEqual;
 "use strict";
 /* WEBPACK VAR INJECTION */(function(wx) {
 
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _utils = __webpack_require__(/*! ./utils */ 869);
-var _shared = __webpack_require__(/*! ./shared */ 870);
-var _validator = __webpack_require__(/*! ../common/validator */ 780);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _utils = __webpack_require__(/*! ./utils */ 873);
+var _shared = __webpack_require__(/*! ./shared */ 874);
+var _validator = __webpack_require__(/*! ../common/validator */ 784);
 (0, _component.VantComponent)({
   props: Object.assign(Object.assign(Object.assign(Object.assign({
     disabled: Boolean,
@@ -33153,7 +33153,7 @@ var _validator = __webpack_require__(/*! ../common/validator */ 780);
 
 /***/ }),
 
-/***/ 869:
+/***/ 873:
 /*!***********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/uploader/utils.js ***!
   \***********************************************************************/
@@ -33169,8 +33169,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.chooseFile = chooseFile;
 exports.isImageFile = isImageFile;
 exports.isVideoFile = isVideoFile;
-var _utils = __webpack_require__(/*! ../common/utils */ 779);
-var _validator = __webpack_require__(/*! ../common/validator */ 780);
+var _utils = __webpack_require__(/*! ../common/utils */ 783);
+var _validator = __webpack_require__(/*! ../common/validator */ 784);
 function isImageFile(item) {
   if (item.isImage != null) {
     return item.isImage;
@@ -33300,7 +33300,7 @@ function chooseFile(_ref) {
 
 /***/ }),
 
-/***/ 870:
+/***/ 874:
 /*!************************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/uploader/shared.js ***!
   \************************************************************************/
@@ -33378,7 +33378,7 @@ exports.messageFileProps = messageFileProps;
 
 /***/ }),
 
-/***/ 876:
+/***/ 880:
 /*!******************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/tab/index.js ***!
   \******************************************************************/
@@ -33388,8 +33388,8 @@ exports.messageFileProps = messageFileProps;
 "use strict";
 
 
-var _relation = __webpack_require__(/*! ../common/relation */ 776);
-var _component = __webpack_require__(/*! ../common/component */ 774);
+var _relation = __webpack_require__(/*! ../common/relation */ 780);
+var _component = __webpack_require__(/*! ../common/component */ 778);
 (0, _component.VantComponent)({
   relation: (0, _relation.useParent)('tabs'),
   props: {
@@ -33447,7 +33447,7 @@ var _component = __webpack_require__(/*! ../common/component */ 774);
 
 /***/ }),
 
-/***/ 877:
+/***/ 881:
 /*!*******************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/tabs/index.js ***!
   \*******************************************************************/
@@ -33459,11 +33459,11 @@ var _component = __webpack_require__(/*! ../common/component */ 774);
 
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ 5));
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _touch = __webpack_require__(/*! ../mixins/touch */ 878);
-var _utils = __webpack_require__(/*! ../common/utils */ 779);
-var _validator = __webpack_require__(/*! ../common/validator */ 780);
-var _relation = __webpack_require__(/*! ../common/relation */ 776);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _touch = __webpack_require__(/*! ../mixins/touch */ 882);
+var _utils = __webpack_require__(/*! ../common/utils */ 783);
+var _validator = __webpack_require__(/*! ../common/validator */ 784);
+var _relation = __webpack_require__(/*! ../common/relation */ 780);
 (0, _component.VantComponent)({
   mixins: [_touch.touch],
   classes: ['nav-class', 'tab-class', 'tab-active-class', 'line-class', 'wrap-class'],
@@ -33793,7 +33793,7 @@ var _relation = __webpack_require__(/*! ../common/relation */ 776);
 
 /***/ }),
 
-/***/ 878:
+/***/ 882:
 /*!*********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/mixins/touch.js ***!
   \*********************************************************************/
@@ -33847,7 +33847,7 @@ exports.touch = touch;
 
 /***/ }),
 
-/***/ 879:
+/***/ 883:
 /*!********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/empty/index.js ***!
   \********************************************************************/
@@ -33857,7 +33857,7 @@ exports.touch = touch;
 "use strict";
 
 
-var _component = __webpack_require__(/*! ../common/component */ 774);
+var _component = __webpack_require__(/*! ../common/component */ 778);
 (0, _component.VantComponent)({
   props: {
     description: String,
@@ -33870,7 +33870,7 @@ var _component = __webpack_require__(/*! ../common/component */ 774);
 
 /***/ }),
 
-/***/ 885:
+/***/ 889:
 /*!************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js ***!
   \************************************************************************************************/
@@ -33885,9 +33885,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 886));
-var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 887));
-var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 888));
+var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 890));
+var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 891));
+var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 892));
 var _default = {
   en: _en.default,
   'zh-Hans': _zhHans.default,
@@ -33897,7 +33897,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 886:
+/***/ 890:
 /*!***********************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json ***!
   \***********************************************************************************************/
@@ -33908,7 +33908,7 @@ module.exports = JSON.parse("{\"uni-search-bar.cancel\":\"cancel\",\"uni-search-
 
 /***/ }),
 
-/***/ 887:
+/***/ 891:
 /*!****************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json ***!
   \****************************************************************************************************/
@@ -33919,7 +33919,7 @@ module.exports = JSON.parse("{\"uni-search-bar.cancel\":\"cancel\",\"uni-search-
 
 /***/ }),
 
-/***/ 888:
+/***/ 892:
 /*!****************************************************************************************************!*\
   !*** D:/project/product_wx/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json ***!
   \****************************************************************************************************/
@@ -33930,7 +33930,7 @@ module.exports = JSON.parse("{\"uni-search-bar.cancel\":\"cancel\",\"uni-search-
 
 /***/ }),
 
-/***/ 891:
+/***/ 895:
 /*!******************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/row/index.js ***!
   \******************************************************************/
@@ -33940,8 +33940,8 @@ module.exports = JSON.parse("{\"uni-search-bar.cancel\":\"cancel\",\"uni-search-
 "use strict";
 
 
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _relation = __webpack_require__(/*! ../common/relation */ 776);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _relation = __webpack_require__(/*! ../common/relation */ 780);
 (0, _component.VantComponent)({
   relation: (0, _relation.useChildren)('col', function (target) {
     var gutter = this.data.gutter;
@@ -33969,7 +33969,7 @@ var _relation = __webpack_require__(/*! ../common/relation */ 776);
 
 /***/ }),
 
-/***/ 892:
+/***/ 896:
 /*!******************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/col/index.js ***!
   \******************************************************************/
@@ -33979,8 +33979,8 @@ var _relation = __webpack_require__(/*! ../common/relation */ 776);
 "use strict";
 
 
-var _relation = __webpack_require__(/*! ../common/relation */ 776);
-var _component = __webpack_require__(/*! ../common/component */ 774);
+var _relation = __webpack_require__(/*! ../common/relation */ 780);
+var _component = __webpack_require__(/*! ../common/component */ 778);
 (0, _component.VantComponent)({
   relation: (0, _relation.useParent)('row'),
   props: {
@@ -34009,7 +34009,7 @@ module.exports = _arrayLikeToArray, module.exports.__esModule = true, module.exp
 
 /***/ }),
 
-/***/ 943:
+/***/ 947:
 /*!*********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/picker/index.js ***!
   \*********************************************************************/
@@ -34019,8 +34019,8 @@ module.exports = _arrayLikeToArray, module.exports.__esModule = true, module.exp
 "use strict";
 
 
-var _component = __webpack_require__(/*! ../common/component */ 774);
-var _shared = __webpack_require__(/*! ./shared */ 944);
+var _component = __webpack_require__(/*! ../common/component */ 778);
+var _shared = __webpack_require__(/*! ./shared */ 948);
 (0, _component.VantComponent)({
   classes: ['active-class', 'toolbar-class', 'column-class'],
   props: Object.assign(Object.assign({}, _shared.pickerProps), {
@@ -34183,7 +34183,7 @@ var _shared = __webpack_require__(/*! ./shared */ 944);
 
 /***/ }),
 
-/***/ 944:
+/***/ 948:
 /*!**********************************************************************!*\
   !*** D:/project/product_wx/wxcomponents/weapp/dist/picker/shared.js ***!
   \**********************************************************************/

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -249,7 +249,7 @@ var _http = __webpack_require__(/*! @/js_sdk/http */ 63);
 // import {demo} from "@/js_sdk/http"
 var EnterpriseSide = function EnterpriseSide() {
   __webpack_require__.e(/*! require.ensure | pages/index/components/enterpriseSide */ "pages/index/components/enterpriseSide").then((function () {
-    return resolve(__webpack_require__(/*! ./components/enterpriseSide.vue */ 744));
+    return resolve(__webpack_require__(/*! ./components/enterpriseSide.vue */ 748));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -314,14 +314,16 @@ var _default = {
       // },
 
       {
-        label: "报修派单",
+        label: "报修受理",
         url: "https://www.idea-co-sf.com/gardenProduct/image/bxpd.png",
-        path: "/pages/subPackages/repairDispatch-app/index"
-      }, {
-        label: "报修处理",
-        url: "https://www.idea-co-sf.com/gardenProduct/image/bxcl.png",
         path: "/pages/subPackages/todo/repairAcceptance"
-      }, {
+      },
+      // {
+      //   label: "报修处理",
+      //   url: "https://www.idea-co-sf.com/gardenProduct/image/bxcl.png",
+      //   path: "/pages/subPackages/todo/repairAcceptance",
+      // },
+      {
         label: "房间管理",
         url: "https://www.idea-co-sf.com/gardenProduct/image/fjgl.png",
         path: "/pages/subPackages/propertyManagement/maintenance"

unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -386,7 +386,7 @@ var _default = {
       });
     },
     editPassWord: function editPassWord() {
-      uni.goNavigateBack();
+      uni.navigateBack();
     },
     getUserInfo: function getUserInfo() {
       var _this2 = this;

unpackage/dist/dev/mp-weixin/pages/subPackages/activity/index.js

@@ -145,12 +145,12 @@ exports.default = void 0;
 var _http = __webpack_require__(/*! @/js_sdk/http */ 63);
 var TelNum = function TelNum() {
   __webpack_require__.e(/*! require.ensure | pages/subPackages/components/tel-number/index */ "pages/subPackages/components/tel-number/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../subPackages/components/tel-number */ 751));
+    return resolve(__webpack_require__(/*! ../../subPackages/components/tel-number */ 755));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var ApplyPopup = function ApplyPopup() {
   __webpack_require__.e(/*! require.ensure | pages/subPackages/activity/apply-popup */ "pages/subPackages/activity/apply-popup").then((function () {
-    return resolve(__webpack_require__(/*! ./apply-popup.vue */ 758));
+    return resolve(__webpack_require__(/*! ./apply-popup.vue */ 762));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {