产品化更新

pages.json

@@ -826,6 +826,111 @@
                         }
                     }
                 },
+                {
+                    "path": "todo/repairAcceptance",
+                    "style": {
+                        "navigationBarTitleText": "报修受理",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-empty": "/wxcomponents/weapp/dist/empty/index",
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index"
+                        }
+                    }
+                },
+                {
+                    "path": "todo/addRepair",
+                    "style": {
+                        "navigationBarTitleText": "新增报修",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-empty": "/wxcomponents/weapp/dist/empty/index",
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index"
+                        }
+                    }
+                },
+                {
+                    "path": "todo/dispatch",
+                    "style": {
+                        "navigationBarTitleText": "报修派单",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-empty": "/wxcomponents/weapp/dist/empty/index",
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index"
+                        }
+                    }
+                },
                 {
                     "path": "venueRoom/confirm",
                     "style": {

pages/index/index.vue

@@ -6,10 +6,9 @@
         class="banner"
       ></image>
       <div class="needBox">
-        <div class="needLeft">
+        <div class="needLeft"  @click="toMsgPage('/pages/subPackages/todo/index')">
           <div
             class="needLeftLeft"
-            @click="toMsgPage('/pages/subPackages/todo/index')"
           >
             <span style="color: #18172a; font-size: 4.5vw; margin-bottom: 1vw"
               >我的待办</span

pages/subPackages/todo/addRepair.vue

@@ -0,0 +1,261 @@
+<template>
+  <div class="addRepair">
+    <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>
+        </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>
+        </li>
+        <li class="detailLi2">
+          <span class="liName">
+            快捷选择
+          </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>
+            <van-field
+                :value="form.contant"
+                autosize
+                type="textarea"
+                placeholder="请输入文字进行报事报修描述"
+                class="myField"
+                maxlength="800"
+                show-word-limit
+            />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            <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>
+        </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" style="border-bottom: none">
+          <span class="liName">
+            报事人
+          </span>
+          <span class="liInfo">
+            章敏-18915281562
+          </span>
+        </li>
+      </ul>
+    </div>
+    <div class="buttonBox">
+      <button class="btn zcBtn" @tap="closePage">关闭</button>
+      <button class="btn tjBtn">保存</button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data(){
+    return{
+      isCheck:false,
+      isCheck2:false,
+      form:{
+        contant:''
+      },
+      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:[]
+    }
+  },
+  methods:{
+    // toRecord() {
+    //   uni.navigateTo({
+    //     url:'/pages/subPackages/reportRepair/repairRecord'
+    //   })
+    // },
+    closePage() {
+      uni.navigateTo({
+        url:'/pages/subPackages/todo/repairAcceptance'
+      })
+    },
+    clickCheck(item){
+      item.isCheck = !item.isCheck
+    },
+    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;
+          .radio{
+            margin-left: 64rpx;
+          }
+        }
+      }
+      .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;
+    }
+    .zcBtn{
+      background: #FE8643;
+    }
+    .tjBtn{
+      background: #0365F9;
+    }
+  }
+}
+</style>

pages/subPackages/todo/dispatch.vue

@@ -0,0 +1,400 @@
+<template>
+  <div class="addRepair">
+    <div class="reportBody">
+      <ul class="detailUl">
+        <li class="detailLi">
+          <span class="liName">当前企业</span>
+          <span class="liInfo">无锡XXXXX有限公司</span>
+        </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>
+        </li>
+        <li class="detailLi2">
+          <span class="liName">
+            快捷选择
+          </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>
+            <van-field
+                :value="form.contant"
+                autosize
+                type="textarea"
+                placeholder="请输入文字进行报事报修描述"
+                class="myField"
+                maxlength="800"
+                show-word-limit
+            />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            <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>
+        </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="../parkActivity/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="./image/upImage.svg" class="handleImg">
+           <span>上报</span>
+         </div>
+         <img src="./image/arrow.png" class="handleArrow">
+         <div class="imageItem">
+            <img src="./image/acceptance.svg" class="handleImg">
+            <span>受理</span>
+         </div>
+         <img src="./image/arrow.png" class="handleArrow">
+         <div class="imageItem">
+             <img :src="optionsType==='待受理'?require('./image/unHandle.svg'):require('./image/handle.svg')" class="handleImg">
+             <span>处理</span>
+         </div>
+         <img src="./image/arrow.png" class="handleArrow">
+         <div class="imageItem">
+            <img src="./image/evaluate.svg" class="handleImg">
+            <span>评价</span>
+         </div>
+       </div>
+    </div>
+    <div class="reportBody">
+      <ul class="detailUl">
+        <li class="detailLi">
+           <span class="liInfo">
+              <label>
+                  <radio value="报事" :checked="true" color="#0365F9" />派单
+              </label>
+              <label style="margin-left: 64rpx">
+                  <radio value="咨询" :checked="false" color="#0365F9" disabled/>处理
+               </label>
+          </span>
+        </li>
+        <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>
+      </ul>
+    </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>
+export default {
+  data(){
+    return{
+      isCheck:false,
+      isCheck2:false,
+      form:{
+        contant:''
+      },
+      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:''
+    }
+  },
+  onLoad(options) {
+    console.log(options);
+    this.optionsType = options.type
+    if (options.type==='待处理'){
+        uni.setNavigationBarTitle({
+          title: '报修处理',
+        });
+    }else if(options.type==='已处理'){
+      uni.setNavigationBarTitle({
+        title: '报修详情',
+      });
+    }else {
+      uni.setNavigationBarTitle({
+        title: '报修派单',
+      });
+    }
+  },
+  methods:{
+    // toRecord() {
+    //   uni.navigateTo({
+    //     url:'/pages/subPackages/reportRepair/repairRecord'
+    //   })
+    // },
+    closePage() {
+      uni.navigateTo({
+        url:'/pages/subPackages/todo/repairAcceptance'
+      })
+    },
+    clickCheck(item){
+      item.isCheck = !item.isCheck
+    },
+    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;
+          .radio{
+            margin-left: 64rpx;
+          }
+          .phoneIcon{
+            width: 64rpx;
+            height: 64rpx;
+            margin-left: 24rpx;
+          }
+        }
+      }
+      .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;
+    .handleTitle{
+      color: rgba(34, 34, 34, 1);
+      font-size: 36rpx;
+      font-weight: 600;
+    }
+    .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;
+    }
+  }
+}
+</style>

pages/subPackages/todo/index.vue

@@ -30,6 +30,10 @@ export default {
         uni.navigateTo({
           url:'/pages/subPackages/todo/predetermineDetail'
         })
+      }else if(item.tag.includes('报事报修')){
+        uni.navigateTo({
+          url:'/pages/subPackages/todo/repairAcceptance'
+        })
       }
     }
   }

pages/subPackages/todo/predetermineDetail.vue

@@ -71,9 +71,14 @@
           show-cancel-button
           confirm-button-open-type="getUserInfo"
           @confirm="confirm"
+          confirm-button-text="好的"
+          cancel-button-text="不用了"
+          confirm-button-color="rgba(87, 107, 149, 1)"
       >
         <div class="dialogInfo">
-           <van-icon name="warning" style="color:red"/> &nbsp;确认添加后将由您负责跟进该项目！
+          <van-icon name="warning" style="color:#10aeff;font-size: 128rpx"/>
+          <span style="margin-top: 16rpx">确认添加后将由您负责</span>
+          <span style="margin-top: 8rpx">跟进该项目！</span>
         </div>
       </van-dialog>
     </div>
@@ -250,7 +255,11 @@ export default {
       }
       .dialogInfo{
         padding: 64rpx 32rpx;
-        font-size: 32rpx;
+        font-size: 34rpx;
+        color:rgba(51, 51, 51, 1);
+        display: flex;
+        flex-direction: column;
+        align-items: center;
       }
     }
 </style>

pages/subPackages/todo/repairAcceptance.vue

@@ -0,0 +1,136 @@
+<template>
+    <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="repairItemTitleRow">
+            <span class="titleName">{{item.name}}</span>
+            <span class="titleTag" :class="item.type==='待处理'?'titleTag2':item.type==='已处理'?'titleTag3':'titleTag'">{{item.type}}</span>
+          </div>
+          <div class="companyBox">
+            <img src="https://www.idea-co-sf.com/gardenProduct/image/gs.svg" class="gsIcon">
+            <span class="companyName">无锡 XXXX有限公司</span>
+          </div>
+          <div class="upTimeBox">上报时间：2021-1-21  13:00</div>
+        </div>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "repairAcceptance",
+  data(){
+    return{
+      repairList:[
+        {name:'上月水费不太对，怀疑水表异常',type:'待受理'},
+        {name:'空调坏了，不能使用',type:'待处理'},
+        {name:'空调坏了，不能使用',type:'已处理'},
+      ]
+    }
+  },
+  methods:{
+    addRepair(){
+      uni.navigateTo({
+        url:'/pages/subPackages/todo/addRepair'
+      })
+    },
+    toDetail(item) {
+      uni.navigateTo({
+        url:'/pages/subPackages/todo/dispatch?type=' + item.type
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .repairAcceptance{
+      .whiteBoard{
+        background: white;
+        margin-top: 24rpx;
+        box-sizing: border-box;
+        padding: 32rpx;
+        height: 1424rpx;
+        .addRepair{
+          display: flex;
+          justify-content: flex-end;
+          align-items: center;
+          color: rgba(3, 101, 249, 1);
+
+        }
+        .repairItem{
+          background: rgba(245, 247, 250, 1);
+          border-radius: 16rpx;
+          width: 686rpx;
+          height: 224rpx;
+          padding: 32rpx 0 24rpx 0;
+          box-sizing: border-box;
+          margin-top: 24rpx;
+          .repairItemTitleRow{
+            display: flex;
+            justify-content: space-between;
+            padding: 0 32rpx;
+            .titleName{
+              color: rgba(34, 34, 34, 1);
+              font-size: 32rpx;
+              font-weight: 600;
+            }
+            .titleTag{
+              width: 112rpx;
+              height: 48rpx;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              border-radius: 4rpx;
+              color: rgba(242, 25, 18, 1);
+              font-size: 28rpx;
+              background: rgba(242, 25, 18, 0.20);
+            }
+            .titleTag2{
+              width: 112rpx;
+              height: 48rpx;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              border-radius: 4rpx;
+              color: rgba(255, 107, 24, 1);
+              font-size: 28rpx;
+              background: rgba(255, 107, 24, 0.20);
+            }
+            .titleTag3{
+              width: 112rpx;
+              height: 48rpx;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              border-radius: 4rpx;
+              color: rgba(34, 181, 101, 1);
+              font-size: 28rpx;
+              background: rgba(34, 181, 101, 0.20);
+            }
+          }
+          .companyBox{
+            display: flex;
+            align-items: center;
+            padding: 8rpx 32rpx 24rpx 32rpx;
+            .gsIcon{
+              width: 32rpx;
+              height: 32rpx;
+            }
+            .companyName{
+              font-size: 28rpx;
+              color: rgba(102, 102, 102, 1);
+              margin-left: 8rpx;
+            }
+          }
+          .upTimeBox{
+            padding: 16rpx 32rpx 0 32rpx;
+            border-top: 1px solid rgba(230, 230, 230, 1);
+            color: rgba(102, 102, 102, 1);
+            font-size: 28rpx;
+          }
+        }
+      }
+    }
+</style>

pages/subPackages/toread/index.vue

@@ -1,215 +1,124 @@
 <template>
   <div class="secureselftest">
-    <div class="list">
-      <!-- <div v-if="readList.length == 0"> -->
-      <div
-        class="list-row"
-        v-for="(item, index) in readList"
-        @click="
-          junmpMyMechantsDetails(
-            item.routeParam,
-            item.handleType,
-            item.readType
-          )
-        "
-        :key="index"
-      >
-        <div class="cell_1">
-          <div class="width100 height44rpx mb16rpx">
-            <div class="first_title">
-              {{ item.title }}
-            </div>
+     <div class="toReadItem" v-for="item in msgList" @tap="showDialog(item)" >
+          <div class="readTitle">【{{item.type}}】</div>
+          <div class="readInfo">{{item.info}}</div>
+          <div class="readTime">2024-04-25  09:00</div>
+     </div>
+    <van-dialog
+        use-slot
+        title="消息提醒"
+        :show="show"
+        :show-cancel-button="false"
+        confirm-button-text="我知道了"
+        confirm-button-color="rgba(87, 107, 149, 1)"
+        @confirm="confirm"
+        width="640rpx"
+    >
+      <div class="dialogBox">
+        <div class="dialogInfoTitle">XXXXSSSSSXX企业名称XXXX企业的合同即将到期，请尽快续约。</div>
+        <div class="dialogInfo">
+          <div class="infoRow">
+            <span class="infoTitle">合同编号：</span>
+            <span class="infoMsg">HT20240514</span>
           </div>
-          <div class="width100 height40rpx">
-            <div class="second_title" style="width: 100%">
-              {{ item.createdAt }}
-            </div>
+          <div class="infoRow">
+            <span class="infoTitle">关联载体：</span>
+            <span class="infoMsg"></span>
+          </div>
+          <div class="infoRow">
+            <span class="infoTitle">合同起止日期：</span>
+            <span class="infoMsg">2023/01/01 ~ 2024/12/30</span>
           </div>
         </div>
       </div>
-      <!-- </div> -->
-      <!-- <div v-else> -->
-      <van-empty
-        v-if="readList.length == 0"
-        class="disblock marginauto"
-        style="background: white"
-        description="暂无数据"
-      />
-      <!-- </div> -->
-    </div>
+    </van-dialog>
   </div>
 </template>
-      
-      <script>
-import { readList, getByCodes, getUserLocalStorageInfo } from "@/js_sdk/http";
-import vanEmpty from "../../../wxcomponents/weapp/dist/empty/index";
 
+<script>
 export default {
-  components: {
-    vanEmpty,
-  },
-  data() {
-    return {
-      dic_key: ["safety_inspection_type"],
-      dic_SelectList: {},
-      active: 0,
-      readList: [],
-      search: {
-        pageSize: 10,
-        pageNum: 1,
-        types: "5,6",
-        userId: "",
-      },
-      statusList: [
-        { label: "全部", value: null },
-        { label: "电梯自检", value: "1" },
-        { label: "消防自检", value: "2" },
-        { label: "电柜检查", value: "3" },
-        { label: "电器线路", value: "4" },
+  data(){
+    return{
+      msgList:[
+        {type:'合同到期提醒',info:'xxxxsssSSXX企业名称XXXX企业的合同即将到期请尽快续约.'}
       ],
-    };
+      show:false
+    }
   },
-  onShow() {
-    // this.getByCodes();
-    this.search.userId = getUserLocalStorageInfo().id;
-    this.getreadList();
-  },
-  methods: {
-    getDicType(value) {
-      if (!value) return "未知类型";
-
-      let safety_inspection_type = this.dic_SelectList.safety_inspection_type;
-      let index = safety_inspection_type.findIndex((e) => e.value == value);
-      return safety_inspection_type[index].label;
-    },
-
-    junmpMyMechantsDetails(routeParam, type, readType) {
-      console.log(type);
-      console.log(routeParam);
-      if (readType == 6) {
-        let param = routeParam.split(",");
-        console.log(param);
-        uni.navigateTo({
-          url: "/pages/subPackages/repairprocessing-app/detail?id=" + param[1],
-        });
-      }
-      if (type == 6) {
-        uni.navigateTo({
-          url:
-            "/pages/subPackages/repairprocessing-app/detail?id=" + routeParam,
-        });
-      }
-      if (type == 5) {
-        uni.navigateTo({
-          url:
-            "/pages/subPackages/merchants/components/mymechantsdetails?id=" +
-            routeParam,
-        });
+  methods:{
+    showDialog(item){
+      if (item.type === '合同到期提醒'){
+        this.show = true
       }
     },
-    jumpReport() {
-      uni.navigateTo({
-        url: "/pages/subPackages/secureselftest/report?id=" + null,
-      });
-    },
-    async getMoreListData() {
-      let that = this;
+    confirm(){
 
-      that.search.pageNum = that.search.pageNum + 1;
-      let list = await readList(that.search);
+    }
+  }
+}
 
-      if (list.rows == 0) {
-        that.$showToast("没有更多数据了");
-      } else {
-        list.rows.forEach((e) => {
-          that.readList.push(e);
-        });
-      }
-    },
-    onReachBottom() {
-      this.getMoreListData();
-    }, //下拉执行的时候触发 （下拉刷新）
-    onChange(e) {
-      this.search.type = e.detail.name == null ? "" : e.detail.name;
-      this.getreadList();
-    },
-    endDate() {
-      return this.getDate("end");
-    },
-    startDate() {
-      return this.getDate("start");
-    },
+</script>
 
-    async getByCodes() {
-      let data = await getByCodes(JSON.stringify(this.dic_key));
-      this.dic_SelectList = this.$common.handleDicList(data);
-      this.getreadList();
-    },
-    getDate(type) {
-      const date = new Date();
-      let year = date.getFullYear();
-      let month = date.getMonth() + 1;
-      let day = date.getDate();
 
-      if (type === "start") {
-        year = year - 60;
-      } else if (type === "end") {
-        year = year + 2;
+<style lang="scss">
+    .secureselftest{
+      .toReadItem{
+        margin-top: 24rpx;
+        margin-left: 32rpx;
+        display: flex;
+        flex-direction: column;
+        background: white;
+        width: 686rpx;
+        padding: 32rpx;
+        box-sizing: border-box;
+        border-radius: 16rpx;
+        .readTitle{
+          color: rgba(3, 101, 249, 1);
+          font-size: 28rpx;
+        }
+        .readInfo{
+          color: rgba(51, 51, 51, 1);
+          font-size: 28rpx;
+          line-height: 42rpx;
+          padding: 16rpx 0;
+        }
+        .readTime{
+          color: rgba(102, 102, 102, 1);
+          font-size: 28rpx;
+        }
       }
-      month = month > 9 ? month : "0" + month;
-      day = day > 9 ? day : "0" + day;
-      return `${year}-${month}-${day}`;
-    },
-    async getreadList() {
-      this.search.pageSize = 10;
-      this.search.pageNum = 1;
-      let list = await readList(this.search);
-      //   /wx/SafetyController/readList
+      .dialogBox{
+        padding: 36rpx 24rpx;
+        .dialogInfoTitle{
+          color:rgba(53, 53, 53, 1);
+          font-size: 32rpx;
+          line-height: 48rpx;
+          margin-bottom: 32rpx;
+        }
+        .dialogInfo{
+          background: rgba(245, 247, 250, 1);
+          border-radius: 8rpx;
+          width: 592rpx;
+          padding: 20rpx 16rpx;
+          box-sizing: border-box;
+          .infoRow{
+            display: flex;
+            align-items: center;
+            line-height: 60rpx;
+          }
+          .infoTitle{
+            width: 196rpx;
+            font-size: 28rpx;
+            color: rgba(51, 51, 51, 1);
+          }
+          .infoMsg{
+            color:rgba(102, 102, 102, 1);
+            font-size: 28rpx;
+          }
+        }
+      }
+    }
+</style>
 
-      this.readList = list.rows;
-    },
-    jumpAddCompanyPage() {
-      uni.navigateTo({
-        url: "/pages/subPackages/addCompany/addCompany",
-      });
-    },
 
-    jumpPage(e) {
-      uni.navigateTo({
-        url: "/pages/subPackages/companyDetails/companyDetails?id=" + e,
-      });
-    },
-  },
-};
-</script>
-      
-      
-      <style lang="scss">
-.chooseyears {
-  width: 326rpx;
-  height: 56rpx;
-  background: rgba(29, 24, 188, 0.05);
-  border-radius: 8rpx 8rpx 8rpx 8rpx;
-  text-align: center;
-  line-height: 56rpx;
-  display: flex;
-  color: #1d18bc;
-}
-.searchbox {
-  display: block;
-  background: white;
-}
-.chaochuyincang {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.secureselftest {
-  .custom-class {
-    background: white;
-  }
-}
-</style>
-      
-      
-      

unpackage/dist/dev/mp-weixin/app.json

@@ -30,6 +30,9 @@
         "toread/index",
         "todo/index",
         "todo/predetermineDetail",
+        "todo/repairAcceptance",
+        "todo/addRepair",
+        "todo/dispatch",
         "venueRoom/confirm",
         "housedetails/housedetails",
         "addintention/addintention",

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

@@ -217,11 +217,10 @@ 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 */ 526));
+    return resolve(__webpack_require__(/*! ./components/enterpriseSide.vue */ 550));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

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 */ 533));
+    return resolve(__webpack_require__(/*! ../../subPackages/components/tel-number */ 557));
   }).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 */ 540));
+    return resolve(__webpack_require__(/*! ./apply-popup.vue */ 564));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pages/subPackages/activityPromulgate/list.js

@@ -331,7 +331,7 @@ var _default = {
           if (item.annex && item.annex.length > 2) {
             var annex = _this.$common.castEval(item.annex);
             _this.fileUrlList = annex;
-            item.annexUrl = Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_API_URL + annex[0].url.substring(7, annex[0].url.length);
+            item.annexUrl = Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"产品化管理端","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_API_URL + annex[0].url.substring(7, annex[0].url.length);
           }
           item.releaseTimeStr = _this.$common.transServDate(item.releaseTime);
         });