产品化更新

js_sdk/http.js

@@ -595,3 +595,27 @@ export function listHomeCommunityActivity(data) {
         data, {}
     )
 }
+export function isFinishComInfo(data) {
+    return $http.post(
+        '/wx/company/isFinishComInfo',
+        data, {}
+    )
+}
+export function getById(data) {
+    return $http.post(
+        '/wx/company/getById',
+        data, {}
+    )
+}
+export function addCompanyExamine(data) {
+    return $http.post(
+        '/wx/companyExamine/add',
+        data, {}
+    )
+}
+export function upload(data) {
+    return $http.post(
+        '/wx/fileController/upload',
+        data, {}
+    )
+}

package-lock.json

@@ -1,6 +1,5 @@
 {
-  "name": "树形选择器增强版，支持多选、单选、父级选中子级自动选中、懒加载",
-  "version": "1.0.1",
+  "version": "1.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -569,6 +568,11 @@
         "type": "^1.0.1"
       }
     },
+    "dayjs": {
+      "version": "1.11.11",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/dayjs/-/dayjs-1.11.11.tgz",
+      "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
+    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
@@ -1157,7 +1161,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmmirror.com/gulp/-/gulp-4.0.2.tgz",
       "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-      "dev": true,
       "requires": {
         "glob-watcher": "^5.0.3",
         "gulp-cli": "^2.2.0",
@@ -1169,7 +1172,6 @@
           "version": "2.3.0",
           "resolved": "https://registry.npmmirror.com/gulp-cli/-/gulp-cli-2.3.0.tgz",
           "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
-          "dev": true,
           "requires": {
             "ansi-colors": "^1.0.1",
             "archy": "^1.0.0",
@@ -1197,7 +1199,6 @@
       "version": "9.0.1",
       "resolved": "https://registry.npmmirror.com/gulp-postcss/-/gulp-postcss-9.0.1.tgz",
       "integrity": "sha512-9QUHam5JyXwGUxaaMvoFQVT44tohpEFpM8xBdPfdwTYGM0AItS1iTQz0MpsF8Jroh7GF5Jt2GVPaYgvy8qD2Fw==",
-      "dev": true,
       "requires": {
         "fancy-log": "^1.3.3",
         "plugin-error": "^1.0.1",
@@ -2032,7 +2033,6 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmmirror.com/postcss-px2units/-/postcss-px2units-0.2.0.tgz",
       "integrity": "sha512-Jb3Z63DOh5bxYfxPnS2hDX5RAC1JSc9oBqroL/fN0kYqiNIw7p4plXGqtRKN62pkcfd5CfT6D9XIFFl8Ta3u0A==",
-      "dev": true,
       "requires": {
         "object-assign": "^4.1.1",
         "postcss": "^6.0.19"

package.json

@@ -15,5 +15,8 @@
             "前端组件",
             "通用组件"
         ]
+    },
+    "dependencies": {
+        "dayjs": "^1.11.11"
     }
-}
+}

pages.json

@@ -1353,6 +1353,41 @@
                         }
                     }
                 },
+                {
+                    "path": "reportRepair/repairDetail",
+                    "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-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",
+                            "van-rate": "/wxcomponents/weapp/dist/rate/index"
+                        }
+                    }
+                },
                 {
                     "path": "companyreport/companyreport",
                     "style": {
@@ -2432,6 +2467,189 @@
                             "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
                         }
                     }
+                },
+                {
+                    "path": "serviceEvaluation/index",
+                    "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-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/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",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                        }
+                    }
+                },
+                {
+                    "path": "housingResources/index",
+                    "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-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/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",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                        }
+                    }
+                },
+                {
+                    "path": "housingResources/detail",
+                    "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-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/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",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index",
+                            "van-swipe-cell": "/wxcomponents/weapp/dist/swipe-cell/index"
+                        }
+                    }
+                },
+                {
+                    "path": "housingResources/addPredetermine",
+                    "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-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/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",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index",
+                            "van-swipe-cell": "/wxcomponents/weapp/dist/swipe-cell/index"
+                        }
+                    }
+                },
+                {
+                    "path": "aboutThePark/index",
+                    "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-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/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",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index",
+                            "van-swipe-cell": "/wxcomponents/weapp/dist/swipe-cell/index"
+                        }
+                    }
                 }
             ],
             "network": "all"

pages/index/components/enterpriseSide.vue

@@ -67,7 +67,7 @@
         </div>
         <span style="color: #666666; font-size: 28rpx">好评率：100%</span>
       </div>
-      <div class="evaluationBox">
+      <div class="evaluationBox" @tap="toServiceEva">
         <div class="evaluationBoxName">点击笑脸给出您对园区服务的评价</div>
         <van-rate
           :value="value"
@@ -176,7 +176,7 @@ export default {
         {
           label: "关于园区",
           url: "https://www.idea-co-sf.com/gardenProduct/image/gyyqIcon.png",
-          path: "/pages/subPackages/companyHouse/companyHouse",
+          path: "/pages/subPackages/aboutThePark/index",
         },
         {
           label: "产业政策",
@@ -186,12 +186,17 @@ export default {
         {
           label: "资源预约",
           url: "https://www.idea-co-sf.com/gardenProduct/image/zyyyIcon.png",
-          path: "/pages/subPackages/companyHouse/companyHouse",
+          path: "/pages/subPackages/resourceReservation_manage/index",
         },
       ],
     };
   },
   methods: {
+    toServiceEva(){
+      uni.navigateTo({
+        url:"/pages/subPackages/serviceEvaluation/index",
+      })
+    },
     toNotice() {
       uni.navigateTo({
         url:"/pages/subPackages/propertyNotice/index",
@@ -232,11 +237,15 @@ export default {
       }
     },
     clickTab(item) {
-      this.selectTab = item.name;
+      // this.selectTab = item.name;
       if (item.name==='周边'){
         uni.navigateTo({
           url:'/pages/subPackages/peripheralService/index'
         })
+      }else if(item.name==='房源'){
+        uni.navigateTo({
+          url:'/pages/subPackages/housingResources/index'
+        })
       }
     },
   },

pages/mine/mine.vue

@@ -26,6 +26,7 @@
       <div class="labelpage">
         <div
             class="labelpage_row"
+            @click="toMineInfo"
         >
           <div class="labelpage_text">
             <div class="labelpage_name">企业信息</div>
@@ -159,6 +160,11 @@ export default {
         })
       }
     },
+    toMineInfo(){
+      uni.navigateTo({
+        url:'/pages/subPackages/minePages/mineInfo'
+      })
+    },
     toMineMsg(){
       uni.navigateTo({
         url:'/pages/subPackages/minePages/mineMessage'

pages/subPackages/aboutThePark/index.vue

@@ -0,0 +1,76 @@
+<template>
+    <div class="aboutThePark">
+       <div class="whiteBoard">
+          <img src="../housingResources/testImg.png" class="testImg">
+         <div class="info">
+           XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+           XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+           XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+         </div>
+       </div>
+       <div class="whiteBoard">
+         <div class="detailLi">
+          <span class="liName">
+            <span class="callName">招商电话：</span>
+            <span class="callNumber">0510-680**808</span>
+          </span>
+           <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
+         </div>
+       </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style lang="scss">
+    .aboutThePark{
+      .whiteBoard{
+        background: white;
+        margin: 24rpx 0;
+        padding: 24rpx;
+        .testImg{
+          width: 686rpx;
+          height: 300rpx;
+        }
+        .info{
+          color: #333333;
+          font-size: 28rpx;
+          line-height: 42rpx;
+          margin: 24rpx 0;
+          word-wrap: break-word;
+        }
+        .detailLi{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .liInfo{
+            display: inline-block;
+            text-align: right;
+            max-width: 428rpx;
+            color: rgba(102, 102, 102, 1);
+            font-size: 32rpx;
+            line-height: 38rpx;
+            overflow: hidden;
+            word-wrap: break-word;
+          }
+          .callNumber{
+            color: rgba(24, 23, 42, 1);
+            font-size: 36rpx;
+            font-weight: 600;
+          }
+          .callName{
+            color: rgba(102, 102, 102, 1);
+            font-size: 28rpx;
+          }
+        .phoneIcon{
+          width: 64rpx;
+          height: 64rpx;
+        }
+        }
+      }
+    }
+</style>

pages/subPackages/housingResources/addPredetermine.vue

@@ -0,0 +1,192 @@
+<template>
+  <div class="addPredetermine">
+    <ul class="detailUl">
+      <li class="detailLi">
+        <span class="liName">
+          <span style="color: red;margin-right: 5rpx">*</span>
+          项目/企业名称
+        </span>
+        <span class="liInfo">无锡XXXXX有限公司</span>
+      </li>
+      <li class="detailLi2">
+          <span class="liName" style="margin-bottom: 24rpx">
+            项目/企业简介
+          </span>
+        <van-field
+            :value="form.contant"
+            autosize
+            type="textarea"
+            placeholder="请输入文字进行报事报修描述"
+            class="myField"
+            maxlength="800"
+            show-word-limit
+        />
+      </li>
+      <li class="detailLi2">
+          <span class="liName" style="margin-bottom: 24rpx">
+            <span style="color: red;margin-right: 5rpx">*</span>
+            企业需求
+          </span>
+        <van-field
+            :value="form.contant"
+            autosize
+            type="textarea"
+            placeholder="请输入文字进行报事报修描述"
+            class="myField"
+            maxlength="800"
+            show-word-limit
+        />
+      </li>
+      <li class="detailLi">
+        <span class="liName">
+          <span style="color: red;margin-right: 5rpx">*</span>
+          项目/企业联系人
+        </span>
+        <input class="liInfo" placeholder="请输入"></input>
+      </li>
+      <li class="detailLi" style="border-bottom: none">
+        <span class="liName">
+          <span style="color: red;margin-right: 5rpx">*</span>
+          联系电话
+        </span>
+        <input class="liInfo" placeholder="请输入"></input>
+      </li>
+    </ul>
+    <div class="whiteBoard">
+      <div class="boardTitle">关于房源</div>
+      <div class="boardInfo">
+        <div class="boardItem">XXXXX园区</div>
+        <div class="boardItem">楼盘</div>
+        <div class="boardItem">楼栋地块</div>
+        <div class="boardItem">出租单元号</div>
+      </div>
+    </div>
+    <button class="toYy">提交预定</button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "addPredetermine",
+  data(){
+    return{
+      form:{
+
+      }
+    }
+  },
+  methods:{
+  }
+}
+</script>
+
+<style lang="scss">
+.addPredetermine{
+  .detailUl{
+    margin-top: 20rpx;
+    background: white;
+    padding: 24rpx 32rpx;
+    .liName{
+      font-size: 32rpx;
+      color: rgba(51, 51, 51, 1);
+      white-space: nowrap;
+      .callNumber{
+        color: rgba(24, 23, 42, 1);
+        font-size: 36rpx;
+        font-weight: 600;
+      }
+      .callName{
+        color: rgba(102, 102, 102, 1);
+        font-size: 28rpx;
+      }
+    }
+    .phoneIcon{
+      width: 64rpx;
+      height: 64rpx;
+    }
+    .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;
+        overflow: hidden;
+        word-wrap: break-word;
+      }
+    }
+    .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;
+    }
+  }
+  .whiteBoard{
+    padding: 32rpx;
+    background: white;
+    margin-top: 24rpx;
+    min-height: 260rpx;
+    box-sizing: border-box;
+    .boardTitle{
+      color: rgba(51, 51, 51, 1);
+      font-size: 32rpx;
+      margin-bottom: 24rpx;
+    }
+    .boardInfo{
+      display: flex;
+      flex-wrap: wrap;
+      color: rgba(51, 51, 51, 1);
+      font-size: 32rpx;
+      .boardItem{
+        margin-right: 24rpx;
+      }
+    }
+  }
+  .toYy{
+    width: 654rpx;
+    height: 96rpx;
+    background: rgba(3, 101, 249, 1);
+    margin: 64rpx 48rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36rpx;
+    color: white;
+  }
+}
+
+</style>

pages/subPackages/housingResources/components/houseList.vue

@@ -0,0 +1,350 @@
+<template>
+  <div class="houseList">
+    <div class="selectBody" :style="{ height: height + 'rpx' }">
+      <div class="selectRow">
+        <span class="rowTitle">园区</span>
+        <div class="selectItemBox">
+          <span class="unSelectItem" :class="parkSelect?'selectItem':''">科教产业园</span>
+        </div>
+      </div>
+      <van-icon name="arrow-down" class="arrowDown" style="font-size: 40rpx;margin-top: 40rpx;font-weight: 600" @tap="closeSelectBody" v-if="height<200"/>
+      <div class="selectRow">
+        <span class="rowTitle">楼盘</span>
+        <div class="selectItemBox">
+          <span class="unSelectItem" v-for="item in properties" :class="item.select?'selectItem':''" @click="clickItem(item)">{{ item.name }}</span>
+        </div>
+      </div>
+      <div class="selectRow">
+        <span class="rowTitle">状态</span>
+        <div class="selectItemBox">
+          <van-checkbox-group :value="avaStatus" @change="avaChange" >
+            <van-checkbox name="空置" shape="square">空置</van-checkbox>
+            <van-checkbox name="合同临期" shape="square">合同临期</van-checkbox>
+          </van-checkbox-group>
+        </div>
+      </div>
+      <div class="selectRow">
+        <span class="rowTitle">装修情况</span>
+        <div class="selectItemBox selectItemBoxMoreItem">
+          <van-checkbox-group :value="rentalStatus" @change="rentalChange" >
+            <van-checkbox name="毛坯" shape="square">毛坯</van-checkbox>
+            <van-checkbox name="简装" shape="square">简装</van-checkbox>
+            <van-checkbox name="精装" shape="square">精装</van-checkbox>
+          </van-checkbox-group>
+        </div>
+      </div>
+      <div class="selectRow" >
+        <span class="rowTitle">用途</span>
+        <div class="selectItemBox">
+          <van-checkbox-group :value="useTo" @change="useToChange" >
+            <van-checkbox name="研发办公" shape="square">办公</van-checkbox>
+            <van-checkbox name="生活配套" shape="square">商铺</van-checkbox>
+          </van-checkbox-group>
+        </div>
+      </div>
+      <div class="selectRow">
+        <span class="rowTitle">朝向</span>
+        <div class="selectItemBox">
+          <van-checkbox-group :value="toward" @change="onChange" >
+            <van-checkbox name="东" shape="square">东</van-checkbox>
+            <van-checkbox name="南" shape="square">南</van-checkbox>
+            <van-checkbox name="西" shape="square">西</van-checkbox>
+            <van-checkbox name="北" shape="square">北</van-checkbox>
+          </van-checkbox-group>
+        </div>
+      </div>
+      <div class="selectRow">
+        <span class="rowTitle">指导价</span>
+        <div class="selectItemBox">
+          <input placeholder="元/㎡/月" class="myIpt"/>
+          <span style="margin: 0 18rpx">—</span>
+          <input placeholder="元/㎡/月" class="myIpt"/>
+        </div>
+      </div>
+      <div class="selectRow">
+        <span class="rowTitle">面积</span>
+        <div class="selectItemBox">
+          <input placeholder="㎡" class="myIpt" />
+          <span style="margin: 0 18rpx">—</span>
+          <input placeholder="㎡" class="myIpt" />
+        </div>
+      </div>
+      <div class="btnBox">
+        <button class="czBtn">重置</button>
+        <button class="ssBtn">搜索</button>
+      </div>
+      <van-icon name="arrow-up" style="font-size: 40rpx;margin-top: 40rpx;font-weight: 600" @tap="closeSelectBody"/>
+    </div>
+    <div class="bottomBody">
+      <van-tabs :active="active" @change="onChange">
+        <van-tab title="全部" :name="0"></van-tab>
+        <van-tab title="A" :name="1"></van-tab>
+        <van-tab title="B1" :name="2"></van-tab>
+        <van-tab title="B2" :name="3"></van-tab>
+        <van-tab title="B3" :name="4"></van-tab>
+        <van-tab title="C" :name="5"></van-tab>
+      </van-tabs>
+      <div class="sumBox">
+        共 <span style="color: rgba(3, 101, 249, 1);margin: 0 5rpx">20</span> 间
+      </div>
+      <div class="listBody">
+        <div class="listItem" v-for="item in 5" @tap="toDetail(item)">
+          <div class="firstRow">
+            <span class="itemTitle">中国物联网国际创新园一期A1101</span>
+            <span class="tag">正常</span>
+          </div>
+          <div class="midRow">
+            <span style="width: 300rpx">用途：研发办公</span>
+            <span>装修情况：未知</span>
+          </div>
+          <div class="midRow">
+            <span style="width: 300rpx">面积（㎡）：356㎡</span>
+            <span>朝向：未知</span>
+          </div>
+          <div class="bottomRow">
+            <span>出租指导价（元/㎡/月）：</span>
+            <span class="money">30~35</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "maintenance",
+  data(){
+    return{
+      parkSelect:true,
+      properties: [
+        {name:'一期', select:true},
+        {name:'二期', select:false},
+        {name:'三期', select:false},
+        {name:'四期', select:false},
+      ],
+      toward: ['东', '北'],
+      avaStatus:['空置'],
+      rentalStatus:[],
+      useTo:[],
+      propertyNature:[],
+      height: 890,
+      active: 0
+    }
+  },
+  methods:{
+    clickItem(item){
+      item.select = !item.select
+    },
+    onChange(e){
+      this.toward = e.detail
+    },
+    avaChange(e){
+      this.avaStatus = e.detail
+    },
+    rentalChange(e){
+      this.rentalStatus = e.detail
+    },
+    useToChange(e){
+      this.useTo = e.detail
+    },
+    natureChange(e){
+      this.propertyNature = e.detail
+    },
+    closeSelectBody(){
+      if (this.height > 800){
+        this.height = 130
+      }else{
+        this.height = 890
+      }
+    },
+    toDetail(item) {
+      uni.navigateTo({
+        url:'/pages/subPackages/housingResources/detail'
+      })
+    }
+  }
+
+}
+</script>
+
+<style lang="scss">
+.houseList{
+  padding-bottom: 150rpx;
+  .topSearchBox{
+    background: white;
+    padding:16rpx 32rpx;
+    .van-cell{
+      background: rgba(245, 247, 250, 1);
+      width: 686rpx;
+      border: 1px solid rgba(234, 237, 242, 1) ;
+      border-radius: 8rpx;
+      box-sizing: border-box;
+      padding: 12rpx 32rpx;
+    }
+    .van-icon{
+      color: rgba(3, 101, 249, 1);
+      font-size: 40rpx;
+    }
+  }
+  .selectBody{
+    background: white;
+    display: flex;
+    flex-direction: column;
+    margin: 24rpx 0;
+    padding: 12rpx 32rpx 36rpx 32rpx;
+    box-sizing: border-box;
+    overflow: hidden;
+    position: relative;
+    .selectRow{
+      display: flex;
+      align-items: center;
+      margin-top: 38rpx;
+      .rowTitle{
+        min-width: 120rpx;
+        color: rgba(51, 51, 51, 1);
+        font-size: 30rpx;
+        text-align: right;
+      }
+      .selectItemBox{
+        display: flex;
+        align-items: center;
+        margin-left: 24rpx;
+        .unSelectItem{
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 28rpx;
+          color: rgba(102, 102, 102, 1);
+          padding: 8rpx 18rpx;
+          background: rgba(245, 247, 250, 1);
+          border-radius: 8rpx;
+          margin-right: 24rpx;
+        }
+        .selectItem{
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 28rpx;
+          color: rgba(3, 101, 249, 1);
+          padding: 8rpx 18rpx;
+          background: rgba(3, 101, 249, 0.10);
+          border-radius: 8rpx;
+          margin-right: 24rpx;
+        }
+        .myIpt{
+          width: 240rpx;
+          height: 64rpx;
+          text-align: center;
+          background: rgba(245, 247, 250, 1);
+          box-sizing: border-box;
+          font-size: 26rpx;
+        }
+      }
+      .selectItemBoxMoreItem{
+        .van-checkbox{
+          margin:0 24rpx 24rpx 0;
+        }
+      }
+    }
+    .btnBox{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 48rpx;
+      .czBtn{
+        background: rgba(3, 101, 249, 0.10);
+        border-radius: 8rpx;
+        width: 240rpx;
+        height: 80rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: rgba(3, 101, 249, 1);
+        font-size: 34rpx;
+        letter-spacing: 2rpx;
+      }
+      .ssBtn{
+        background: rgba(3, 101, 249, 1);
+        border-radius: 8rpx;
+        width: 300rpx;
+        height: 80rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: white;
+        font-size: 34rpx;
+        letter-spacing: 2rpx;
+        margin-left: 32rpx;
+      }
+    }
+    .arrowDown{
+      position: absolute;
+      left: 50%;
+      margin-left: -20rpx;
+      top: 50rpx;
+    }
+  }
+  .bottomBody{
+    padding: 32rpx;
+    background: white;
+    width: 100%;
+    box-sizing: border-box;
+    .sumBox{
+      color: rgba(51, 51, 51, 1);
+      font-size: 28rpx;
+      margin: 24rpx 0;
+    }
+    .listBody{
+      display: flex;
+      flex-direction: column;
+      :last-child{
+        border-bottom: none !important;
+      }
+      .listItem{
+        padding: 24rpx 0;
+        border-bottom: 1px solid rgba(230, 230, 230, 1);
+        .firstRow{
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .itemTitle{
+            font-size: 32rpx;
+            color: rgba(51, 51, 51, 1);
+            font-weight: 600;
+          }
+          .tag{
+            width: 120rpx;
+            height: 48rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 26rpx;
+            color: rgba(3, 101, 249, 1);
+            background: linear-gradient( 316deg, #d1e4ff 0%, #adceff 100%);
+            border-radius: 8rpx;
+          }
+        }
+        .midRow{
+          display: flex;
+          align-items: center;
+          color: rgba(136, 136, 136, 1);
+          font-size: 28rpx;
+          margin: 12rpx 0;
+        }
+        .bottomRow{
+          display: flex;
+          align-items: center;
+          color: rgba(51, 51, 51, 1);
+          font-size: 28rpx;
+          margin-top: 8rpx;
+          .money{
+            color: rgba(226, 81, 0, 1);
+            font-size: 40rpx;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

pages/subPackages/housingResources/components/myReservation.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="myReservation">
+    <div class="historyItem" v-for="item in historyList">
+      <div class="tags" :class="item.tag==='待招商确认'?'dqrTag':'yslTag'">{{item.tag}}</div>
+      <div class="historyItemTitle">XXXXX园区  楼盘  楼栋地块  出租单元号</div>
+      <div class="historyItemInfo">预定时间：2024-05-26  13:16</div>
+      <div class="historyItemInfo">企业联系人：江一筒</div>
+      <div class="historyItemInfo">联系电话：A栋一楼</div>
+      <div class="historyItemBottom">
+        <button class="btn" :class="item.tag==='招商已受理'?'yslBtn':''">删除</button>
+        <button class="btn zcBtn" :class="item.tag==='招商已受理'?'yslBtn':''">编辑</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "myReservation",
+  data(){
+    return{
+      historyList:[
+        {tag:'待招商确认'},
+        {tag:'招商已受理'},
+      ]
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+</style>

pages/subPackages/housingResources/detail.vue

@@ -0,0 +1,313 @@
+<template>
+    <div class="housingDetail">
+      <div class="swiperBody">
+        <!--室内外环境图-->
+        <div v-if="selectImgType">
+          <swiper :indicator-dots="false" circular style="height: 360rpx" @change="changeImg">
+            <swiper-item v-for="item in envList">
+              <img :src="item.url" class="swiperImg"/>
+            </swiper-item>
+          </swiper>
+        </div>
+        <!--房型图-->
+        <div v-if="!selectImgType">
+          <swiper :indicator-dots="false" circular style="height: 360rpx" @change="changeImg">
+            <swiper-item v-for="item in layOutList">
+              <img :src="item.url" class="swiperImg"/>
+            </swiper-item>
+          </swiper>
+        </div>
+        <div class="radioBox" @tap="changeType">
+          <div :class="selectImgType?'selectEnvironment':'unSelEn'">
+            室内外环境  <span v-if="selectImgType">{{current}}/{{envList.length}}</span>
+          </div>
+          <div :class="!selectImgType?'selectLayout':'unSelLayout'">
+            房型图  <span v-if="!selectImgType">{{current}}/{{layOutList.length}}</span>
+          </div>
+        </div>
+      </div>
+      <div class="housingInfoBody">
+        <div class="housingName">科创园一期A栋1305</div>
+        <div class="housingImportBox">
+          <div class="housingImportItem">
+            <span class="housingImportInfo">
+              <span style="font-size: 40rpx;font-weight: 600">2899</span>
+              元/㎡/月</span>
+            <span class="housingInportName">出租指导价</span>
+          </div>
+          <div class="housingImportItem">
+            <span class="housingImportInfo">
+               <span style="font-size: 40rpx;font-weight: 600">355</span>
+              ㎡
+            </span>
+            <span class="housingInportName">
+              面积
+            </span>
+          </div>
+          <div class="housingImportItem">
+            <span class="housingImportInfo">
+              <span style="font-size: 40rpx;font-weight: 600">精装</span>
+            </span>
+            <span class="housingInportName">装修情况</span>
+          </div>
+        </div>
+        <div class="placeBox">
+          <span class="placeTit">位置</span>
+          <div class="placeInfo">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</div>
+          <img src="../parkActivity/image/dhIcon.png" class="dhIcon">
+        </div>
+        <div class="housingInfoBox">
+          <div class="housingInfoItem">
+            <span style="color: red">*</span>
+            <span class="infoTitle">区域</span>
+            <span class="infoMsg">科教产业园</span>
+          </div>
+          <div class="housingInfoItem">
+            <span style="color: red">*</span>
+            <span class="infoTitle">楼层</span>
+            <span class="infoMsg">19/28</span>
+          </div>
+          <div class="housingInfoItem">
+            <span style="color: red">*</span>
+            <span class="infoTitle">出租单元号</span>
+            <span class="infoMsg">1904号</span>
+          </div>
+          <div class="housingInfoItem">
+            <span style="color: red;visibility: hidden">*</span>
+            <span class="infoTitle">平面图单元号</span>
+            <span class="infoMsg">1904号</span>
+          </div>
+          <div class="housingInfoItem">
+            <span style="color: red;">*</span>
+            <span class="infoTitle">用途</span>
+            <span class="infoMsg">研发办公</span>
+          </div>
+          <div class="housingInfoItem">
+            <span style="color: red;">*</span>
+            <span class="infoTitle">朝向</span>
+            <span class="infoMsg">南</span>
+          </div>
+          <div class="housingInfoItem">
+            <span style="color: red;visibility: hidden">*</span>
+            <span class="infoTitle">称重情况（kg/㎡）</span>
+            <span class="infoMsg"></span>
+          </div>
+          <div class="housingInfoItem">
+            <span style="color: red;visibility: hidden">*</span>
+            <span class="infoTitle">层高（m）</span>
+            <span class="infoMsg">4.5m</span>
+          </div>
+          <div class="housingInfoItem">
+            <span style="color: red;visibility: hidden">*</span>
+            <span class="infoTitle">用电说明</span>
+            <span class="infoMsg"></span>
+          </div>
+          <div class="housingInfoItem" style="margin-top: 12rpx">
+            <span style="color: red;visibility: hidden">*</span>
+            <span class="infoTitle">备注</span>
+          </div>
+          <div class="bzInfo">
+            XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+          </div>
+        </div>
+        <button class="submitBtn" @click="toPredetermine">去预定</button>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "detail",
+  data() {
+    return {
+      selectImgType:true,
+      current:1,
+      envList:[
+        {url:require('./testImg.png')},
+        {url:require('./testImg.png')},
+        {url:require('./testImg.png')},
+        {url:require('./testImg.png')},
+        {url:require('./testImg.png')},
+      ],
+      layOutList:[
+        {url:require('./testImg.png')},
+        {url:require('./testImg.png')},
+      ]
+    };
+  },
+  methods:{
+    changeType(){
+      this.selectImgType = !this.selectImgType
+      this.current = 1
+    },
+    changeImg(index){
+      this.current = index.detail.current+1
+    },
+    toPredetermine() {
+      uni.navigateTo({
+        url:'/pages/subPackages/housingResources/addPredetermine'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .housingDetail{
+      .swiperBody{
+        position: relative;
+        .swiperImg{
+          width: 750rpx;
+          height: 360rpx;
+        }
+        .radioBox{
+          width: 344rpx;
+          height: 60rpx;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          border-radius: 30rpx;
+          background: rgba(0, 0, 0, 0.70);
+          position: absolute;
+          color: white;
+          left: 204rpx;
+          top: 268rpx;
+          font-size: 26rpx;
+          box-sizing: border-box;
+          .selectEnvironment{
+            width: 220rpx;
+            height: 60rpx;
+            background: rgba(3, 101, 249, 1);
+            border-radius: 30rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+          }
+          .unSelEn{
+            width: 164rpx;
+            height: 60rpx;
+            border-radius: 30rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+          }
+          .selectLayout{
+            width: 180rpx;
+            height: 60rpx;
+            display: flex;
+            background: rgba(3, 101, 249, 1);
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            border-radius: 30rpx;
+          }
+          .unSelLayout{
+            width: 124rpx;
+            height: 60rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            border-radius: 30rpx;
+          }
+        }
+      }
+      .housingInfoBody{
+        background: white;
+        padding: 32rpx;
+        .housingName{
+          font-size: 40rpx;
+          color: rgba(51, 51, 51, 1);
+          margin-bottom: 24rpx;
+        }
+        .housingImportBox{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding:0 10rpx;
+          .housingImportItem{
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            .housingImportInfo{
+              color: rgba(226, 81, 0, 1);
+              font-size: 28rpx;
+              line-height: 46rox;
+            }
+            .housingInportName{
+              color: rgba(136, 136, 136, 1);
+              font-size: 28rpx;
+              line-height: 32rpx;
+              margin-top: 10rpx;
+            }
+          }
+        }
+      }
+      .placeBox{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        background: rgba(245, 247, 250, 1);
+        padding: 16rpx 24rpx;
+        border-radius: 8rpx;
+        margin-top: 32rpx;
+        .placeTit{
+          color: rgba(136, 136, 136, 1);
+          font-size: 28rpx;
+          white-space: nowrap;
+        }
+        .placeInfo{
+          color:rgba(51, 51, 51, 1);
+          font-size: 28rpx;
+          width: 466rpx;
+          line-height: 42rpx;
+          word-wrap: break-word;
+        }
+        .dhIcon{
+          width: 48rpx;
+          height: 48rpx;
+        }
+      }
+      .housingInfoBox{
+        display: flex;
+        flex-direction: column;
+        margin-top: 32rpx;
+        .housingInfoItem{
+          display: flex;
+          align-items: center;
+          margin-bottom: 24rpx;
+          .infoTitle{
+            color: rgba(136, 136, 136, 1);
+            font-size: 28rpx;
+            margin-left: 8rpx;
+            width: 240rpx;
+          }
+          .infoMsg{
+            font-size: 28rpx;
+            color: rgba(51, 51, 51, 1);
+          }
+        }
+        .bzInfo{
+          width: 640rpx;
+          padding: 0 24rpx;
+          word-wrap: break-word;
+          font-size: 28rpx;
+          color: #333333;
+          line-height: 42rpx;
+        }
+      }
+      .submitBtn{
+        width: 654rpx;
+        height: 96rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: white;
+        font-size: 35rpx;
+        background: rgba(3, 101, 249, 1);
+        margin: 64rpx auto;
+      }
+    }
+</style>

pages/subPackages/housingResources/index.vue

@@ -0,0 +1,145 @@
+<template>
+    <div class="housingResources">
+      <van-tabs :active="active" @change="onChange">
+        <van-tab title="房源查询" :name="0">
+           <houseList />
+        </van-tab>
+        <van-tab title="我的预定" :name="1">
+          <myReservation />
+        </van-tab>
+      </van-tabs>
+    </div>
+</template>
+
+<script>
+import houseList from "./components/houseList.vue";
+import myReservation from "./components/myReservation.vue";
+export default {
+  name: "index",
+  components:{
+    houseList,
+    myReservation
+  },
+  data(){
+    return{
+      active:0
+    }
+  },
+  methods:{
+    onChange(){
+
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .housingResources{
+      .van-checkbox-group{
+        display: flex;
+        flex-wrap: wrap;
+        .van-checkbox{
+          margin-right: 24rpx;
+        }
+        .van-checkbox__label {
+          padding-left: 6rpx;
+          font-size: 28rpx;
+          color: rgba(102, 102, 102, 1);
+        }
+        .van-checkbox__icon{
+          width: 30rpx;
+          height: 30rpx;
+        }
+        .van-icon, .van-icon:before {
+          font-size: 24rpx;
+        }
+        .van-checkbox__icon--checked {
+          background: rgba(3, 101, 249, 1);
+        }
+      }
+    }
+
+    .myReservation{
+      margin-top: 24rpx;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding-bottom: 100rpx;
+      .historyItem{
+        width: 686rpx;
+        padding: 24rpx 0;
+        background: white;
+        box-sizing: border-box;
+        position: relative;
+        border-radius: 16rpx;
+        margin-bottom: 24rpx;
+        .tags{
+          width: 160rpx;
+          height: 56rpx;
+          position: absolute;
+          top: 0;
+          right: 0;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 26rpx;
+          background-size: 100%;
+          box-sizing: border-box;
+        }
+        .dqrTag{
+          background: url('https://www.idea-co-sf.com/gardenProduct/image/bj05.png') no-repeat;
+          color: rgba(226, 81, 0, 1);
+        }
+        .yslTag{
+          background: url('https://www.idea-co-sf.com/gardenProduct/image/bj06.png') no-repeat;
+          color: rgba(3, 101, 249, 1);
+        }
+        .historyItemTitle{
+          padding: 8rpx 32rpx;
+          width: 480rpx;
+          color: rgba(34, 34, 34, 1);
+          font-size: 32rpx;
+          line-height: 40rpx;
+          font-weight: 500;
+        }
+        .historyItemInfo{
+          color: rgba(102, 102, 102, 1);
+          font-size: 28rpx;
+          padding: 10rpx 32rpx;
+        }
+        .historyItemBottom{
+          display: flex;
+          justify-content: flex-end;
+          align-items: center;
+          padding: 28rpx 32rpx 0 32rpx;
+          border-top: 1px solid rgba(232, 237, 245, 1);
+          margin-top: 22rpx;
+          .btn{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 28rpx;
+            width: 160rpx;
+            height: 60rpx;
+            border-radius: 32rpx;
+            border: 2rpx solid rgba(255, 107, 24, 1);
+            color:rgba(255, 107, 24, 1);
+            &::after{
+              border: none;
+            }
+          }
+          .zcBtn{
+            background: linear-gradient( 316deg, #84AAFF 0%, #0365F9 100%);
+            color: white;
+            border: none;
+            margin-left: 32rpx;
+          }
+          .yslBtn{
+            border: none;
+            background: rgba(236, 239, 243, 1);
+            color: rgba(136, 136, 136, 1);
+          }
+        }
+      }
+    }
+</style>

pages/subPackages/minePages/feedback_detail.vue

@@ -22,7 +22,7 @@
           <div class="handleItem">
             <span class="handleTitle">受理人</span>：
             <span class="handleInfo">王斌-13921168766</span>
-            <img src="./image/phoneIcon.png" class="phoneIcon">
+            <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
           </div>
           <div class="handleItem">
             <span class="handleTitle">受理时间</span>：

pages/subPackages/minePages/mineInfo.vue

@@ -0,0 +1,511 @@
+<template>
+  <div class="enterprise">
+    <div class="firstPage">
+      <div class="title">
+        尊敬的 &nbsp;<span class="impotTips comName">{{
+          company.qymc
+        }}</span>
+        &nbsp; 企业用户，你好！
+      </div>
+      <div class="titMsg" v-if="isnew">
+        欢迎你首次登录“园区企业服务平台”，为了更好地为企业提供相关服务，请先<span
+          class="impotTips"
+      >完善贵公司的相关企业信息</span
+      >，并提交登记！
+      </div>
+      <div class="titMsg" v-if="isnew">
+        后续信息
+        <span class="impotTips">如有变动，请及时在“企业信息”中维护更新</span>。
+        感谢您的支持与配合！
+      </div>
+      <div class="titMsg" v-if="!isnew">
+        企业信息
+        <span class="impotTips">如有变动，请及时在“企业信息”中维护更新</span>。
+        感谢您的支持与配合！
+      </div>
+    </div>
+    <div class="secendPage">
+      <ul>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            统一社会信用代码：
+          </div>
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.shxydm"
+              readonly
+          />
+        </li>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            注册资金（万元）：
+          </div>
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.zczj"
+          />
+        </li>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            注册时间：
+          </div>
+          <input
+              type="text"
+              placeholder="请选择"
+              readonly
+              v-model="company.zcsj"
+          />
+        </li>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            法定代表人：
+          </div>
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.fddbr"
+          />
+        </li>
+        <li class="titleLi">
+          法人电话：
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.legalPersonPhone"
+          />
+        </li>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            企业联系人：
+          </div>
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.qylxr"
+          />
+        </li>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            联系人手机：
+          </div>
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.lxdh"
+          />
+        </li>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            联系人邮箱：
+          </div>
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.email"
+          />
+        </li>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            财务负责人：
+          </div>
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.cwfzr"
+          />
+        </li>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            负责人电话：
+          </div>
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.cwfzrdh"
+          />
+        </li>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            注册地址：
+          </div>
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.zcdz"
+          />
+        </li>
+        <li class="titleLi">
+          <div>
+            <span class="required">*</span>
+            经营地址：
+          </div>
+          <input
+              type="text"
+              placeholder="请填写"
+              v-model="company.jydz"
+          />
+        </li>
+        <li class="titleLi area-Li">
+          经营范围：
+          <textarea
+              class="text-area"
+              type="text"
+              rows="4"
+              placeholder="请说明"
+              v-model="company.jyfw"
+          />
+        </li>
+        <li class="titleLi titleLiLast">
+          <div>
+            <span class="required">*</span>
+            营业执照副本（限1张）：
+          </div>
+        </li>
+        <li class="titleLi titleLiUploader">
+          <van-uploader
+              v-model="fileList"
+              multiple
+              max-count="1"
+              :after-read="afterRead"
+              :before-delete="beforeDelete"
+          >
+          </van-uploader>
+        </li>
+        <li class="titleLi titleLiLast">
+          荣誉信息（限6张）：
+        </li>
+        <li class="titleLi area-Li titleLiLast " style="padding: 0;margin: 0">
+                    <textarea
+                        class="text-area"
+                        type="text"
+                        rows="6"
+                        placeholder="请说明"
+                        v-model="company.honorInformation"
+                        style="margin: 0"
+                    />
+        </li>
+        <li class="titleLi titleLiUploader2">
+          <van-uploader
+              v-model="fileList2"
+              multiple
+              max-count="6"
+              :after-read="afterRead2"
+              :before-delete="beforeDelete2"
+          />
+        </li>
+        <li class="titleLi titleLiLast">
+          法人身份证：
+        </li>
+        <li class="titleLi titleLiLast titleLiUploader">
+          <div>
+            <van-uploader
+                v-model="fileList3"
+                multiple
+                max-count="1"
+                :after-read="afterRead3"
+                :before-delete="beforeDelete3"
+            >
+              <img src="https://www.idea-co-sf.com/gardenProduct/image/zm.png" class="sfzImg">
+            </van-uploader>
+            <van-uploader
+                v-model="fileList4"
+                multiple
+                max-count="1"
+                :after-read="afterRead4"
+                :before-delete="beforeDelete4"
+            >
+              <img src="https://www.idea-co-sf.com/gardenProduct/image/fm.png" class="sfzImg">
+            </van-uploader>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div class="buttonBox" v-if="btnShow">
+      <button class="turnOff" @click="commit">暂存</button>
+      <button class="preservation btn2" @click="submit">
+        提交
+      </button>
+    </div>
+    <div v-if="!btnShow" style="padding: 5vw 0;color: orangered;text-align: center">
+      入库审核中......
+    </div>
+    <!-- 时间弹框 -->
+    <van-popup v-model="show" position="bottom" :style="{ height: '50%' }">
+      <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          title="选择年月日"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @cancel="show = false"
+          @confirm="selectTime"
+      /></van-popup>
+    <van-popup v-model="show2" position="bottom" :style="{ height: '50%' }">
+      <van-datetime-picker
+          v-model="currentDate"
+          type="date"
+          title="选择年月日"
+          :min-date="minDate"
+          :max-date="maxDate"
+          @cancel="show2 = false"
+          @confirm="selectTime2"
+      /></van-popup>
+  </div>
+</template>
+<script>
+import { isFinishComInfo, getById, addCompanyExamine,upload } from "@/js_sdk/http.js"
+// import auth from '@/js_sdk/auth.js'
+import constant from '@/pages/utils/constant.js'
+export default {
+  data() {
+    return {
+      isnew: true,
+      radio: '1',
+      fileList: [],
+      fileList2: [],
+      fileIdList2: [],
+      fileIdList3: [],
+      fileIdList4: [],
+      fileIdList5: [],
+      fileList3: [],
+      fileList4: [],
+      frsfzzm: '',
+      frsfzfm: '',
+      selectTag: 0,
+      tagList: [
+      ],
+      checkBoxList: [
+        ],
+      company: {
+        id: '',
+        qymc: '',
+        shxydm: '',
+        zcsj: '',
+        zczj: '',
+        fddbr: '',
+        jyfw: '',
+        qylxr: '',
+        lxdh: '',
+        rzsj: '',
+        ssztmc: '',
+        qylbbq: '',
+        yyzzfbzp: '',
+        ryxxzp: '',
+        legalPersonPhone: '',
+        email: '',
+        cwfzr: '',
+        cwfzrdh: '',
+        zcdz: '',
+        jydz: '',
+        honorInformation: '',
+        rdInvestment: '',
+        jgInvestment: '',
+        fourOpennessAmount: '',
+        fourConsultAmount: '',
+        fourServiceAmount: '',
+        fourTransferenceAmount: '',
+        qybq: ''
+      },
+      show: false,
+      show2: false,
+      minDate: new Date(1980, 0, 1),
+      maxDate: new Date(2025, 10, 1),
+      currentDate: new Date(),
+      selectTagId: '',
+      btnShow: true,
+      qybqList: []
+    }
+  },
+  mounted() {
+  },
+  methods: {
+
+  }
+}
+</script>
+<style lang="scss">
+.enterprise {
+  font-size: 4vw;
+  margin: 5vw 2vw;
+  .firstPage {
+    background: white;
+    padding: 3vw 3vw 3vw 3vw;
+    margin-top: 5vw;
+    border-radius: 15px;
+    .title {
+      height: 10vw;
+      // display: inline-flex;
+      align-items: center;
+      border-bottom: 1px solid rgb(243, 236, 236);
+      margin-bottom: 3vw;
+    }
+    .titMsg {
+      text-indent: 8vw;
+      line-height: 6vw;
+    }
+    .impotTips {
+      color: rgb(0, 47, 167);
+    }
+    .comName {
+      white-space: nowrap;
+    }
+    input {
+      width: 80%;
+    }
+    li {
+      display: flex;
+      align-items: center;
+      height: 10vw;
+      padding: 5vw 0;
+      border-bottom: 1px solid rgb(243, 236, 236);
+    }
+  }
+  .secendPage {
+    background: white;
+    padding: 3vw 3vw 3vw 3vw;
+    margin-top: 5vw;
+    border-radius: 15px;
+    li {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 10vw;
+      padding: 3vw 0;
+      border-bottom: 1px solid rgb(243, 236, 236);
+    }
+    .titleLi {
+      font-size: 3.5vw;
+      //font-weight: 700;
+      white-space: nowrap;
+      color: #333333;
+      .required {
+        color: red;
+      }
+      .van-uploader {
+        padding: 3vw 0;
+      }
+    }
+    .titleLiRadio {
+      .van-radio-group {
+        display: flex;
+        width: 100%;
+        justify-content: space-evenly;
+      }
+    }
+    .titleLiLast {
+      border-bottom: none;
+      padding-bottom: 0;
+    }
+    .titleLiUploader {
+      padding: 10vw 0;
+    }
+    .titleLiUploader2 {
+      padding: 20vw 0;
+    }
+    .van-uploader {
+      padding: 10vw 0;
+    }
+    input {
+      padding: 15px 0 15px 20px;
+      width: 60%;
+    }
+    textarea {
+      padding: 15px 0 15px 20px;
+    }
+  }
+
+  .buttonBox {
+    //background: white;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+    margin-top: 3vw;
+    margin-bottom: 0;
+    padding: 5vw 0;
+    button {
+      padding: 2vw 10vw;
+      border-radius: 15px;
+    }
+    .turnOff {
+      background: white;
+      border: 1px solid rgb(0, 47, 167);
+      color: rgb(0, 47, 167);
+    }
+    .btn2 {
+      background-color: rgb(0, 47, 167);
+      color: white;
+      border: white solid 1px;
+    }
+  }
+  input::placeholder {
+    color: #777777;
+  }
+  .area-Li{
+    height: auto !important;
+    flex-direction: column;
+    align-items: flex-start !important;
+    .text-area{
+      background: #F9F9F9;
+      width: 95%;
+      margin-top: 2vw;
+      resize: none;
+      &::placeholder{
+        color:#AAAAAA
+      }
+    }
+  }
+  .upLoadImg{
+    width: 10vw;
+  }
+  .sfzImg{
+    width: 18vw;
+    height: 16vw;
+    margin: 0vw 2vw 2vw 2vw
+  }
+  .myTag{
+    width: 20vw;
+    height: 7vw;
+    display: flex;
+    font-size: 3.5vw;
+    font-weight: 400;
+    justify-content: center;
+    align-items: center;
+    color: #777777;
+    border: 1px solid rgba(204, 204, 204, 0.51);
+    border-radius: 5px;
+    margin: 1vw 0;
+    box-sizing: border-box;
+  }
+  .selectTag{
+    width: 20vw;
+    height: 7vw;
+    display: flex;
+    font-size: 3.5vw;
+    font-weight: 400;
+    justify-content: center;
+    align-items: center;
+    color: #1D18BC;
+    background: rgba(29, 24, 188, 0.05);
+    border-radius: 5px;
+    margin: 1vw 0;
+  }
+  .checkBoxContant{
+    font-size: 3.5vw;
+    color: rgba(119, 119, 119, 1);
+    line-height: 5vw;
+    padding-left: 8vw;
+  }
+}
+</style>

pages/subPackages/parkActivity/activeApplication.vue

@@ -15,7 +15,7 @@
             <span style="color: #666666;font-size: 28rpx">联系电话：</span>
             <span style="color: #18172A;font-size: 36rpx;font-weight: 600">0510-680**808</span>
           </span>
-          <img src="./image/phoneIcon.png" class="phoneIcon">
+          <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
         </div>
       </div>
       <div class="appSecondBox">

pages/subPackages/peripheralService/detail.vue

@@ -12,7 +12,7 @@
             <span style="color: #666666;font-size: 28rpx">联系电话：</span>
             <span style="color: #18172A;font-size: 36rpx;font-weight: 600">0510-680**808</span>
           </span>
-            <img src="../parkActivity/image/phoneIcon.png" class="phoneIcon">
+            <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
           </div>
         </div>
       <div class="peripheralFirstBox" style="padding: 32rpx">

pages/subPackages/propertyManagement/propertyEditor.vue

@@ -0,0 +1,410 @@
+<template>
+    <div class="propertyEditor">
+      <ul class="detailUl">
+        <li class="detailLi">
+          <span class="liName">
+            <span style="color: red;margin-right: 5rpx">*</span>
+            父级
+          </span>
+          <div class="inputBox" @tap="showPop('父级')">
+            <input placeholder="园区、楼盘、楼栋数" disabled class="myIpt">
+            <van-icon name="arrow-down" />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            <span style="color: red;margin-right: 5rpx">*</span>
+            区域
+          </span>
+          <div class="inputBox">
+            <input placeholder="请选择" disabled class="myIpt">
+            <van-icon name="arrow-down" />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            <span style="color: red;margin-right: 5rpx">*</span>
+            楼层
+          </span>
+          <div class="inputBox">
+            <input placeholder="请选择" disabled class="myIpt">
+            <van-icon name="arrow-down" />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            <span style="color: red;margin-right: 5rpx">*</span>
+            出租单元名称
+          </span>
+           <input placeholder="请填写" class="myIpt" style="padding-right: 30rpx">
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            平面图号
+          </span>
+           <input placeholder="请填写" class="myIpt" style="padding-right: 30rpx">
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+          <span style="color: red;margin-right: 5rpx">*</span>
+            面积（㎡）
+          </span>
+           <input placeholder="请填写" class="myIpt" value="256" style="padding-right: 30rpx">
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+          <span style="color: red;margin-right: 5rpx">*</span>
+            用途
+          </span>
+          <div class="inputBox">
+            <input placeholder="请选择" disabled class="myIpt">
+            <van-icon name="arrow-down" />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            物业性质
+          </span>
+          <div class="inputBox">
+            <input placeholder="请选择" disabled class="myIpt">
+            <van-icon name="arrow-down" />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+          <span style="color: red;margin-right: 5rpx">*</span>
+            朝向
+          </span>
+          <div class="inputBox">
+            <input placeholder="请选择" disabled class="myIpt">
+            <van-icon name="arrow-down" />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+          <span style="color: red;margin-right: 5rpx">*</span>
+            装修情况
+          </span>
+          <div class="inputBox">
+            <input placeholder="请选择" disabled class="myIpt">
+            <van-icon name="arrow-down" />
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            层高
+          </span>
+           <input placeholder="请填写" class="myIpt" style="padding-right: 30rpx">
+        </li>
+        <li class="detailLi2" >
+          <div class="titleBox" >
+            <span class="liName">承重情况</span>
+          </div>
+          <van-field
+              autosize
+              type="textarea"
+              placeholder="请输入"
+              class="myField"
+              maxlength="1000"
+              show-word-limit
+          />
+        </li>
+        <li class="detailLi2" >
+          <div class="titleBox" >
+            <span class="liName">用电说明</span>
+          </div>
+          <van-field
+              autosize
+              type="textarea"
+              placeholder="请输入"
+              class="myField"
+              maxlength="1000"
+              show-word-limit
+          />
+        </li>
+        <li class="detailLi2" >
+          <div class="titleBox" >
+            <span style="color: red;margin-right: 5rpx">*</span>
+            <span class="liName">出租指导价（元/㎡/月）</span>
+          </div>
+          <van-field
+              autosize
+              type="textarea"
+              placeholder="请输入"
+              class="myField"
+          />
+        </li>
+        <li class="detailLi2" >
+          <div class="titleBox" >
+            <span class="liName">备注</span>
+          </div>
+          <van-field
+              autosize
+              type="textarea"
+              placeholder="请输入"
+              class="myField"
+              maxlength="1000"
+              show-word-limit
+          />
+        </li>
+        <li class="detailLi2" >
+          <div class="titleBox" style="margin-bottom: 24rpx">
+            <span class="liName">
+              房型图
+               <span style="color: #B3B3B3;font-size: 28rpx">（只能上传jpg/png格式，限制上传9张）</span>
+            </span>
+          </div>
+          <van-uploader
+              :max-count="9"
+              @delete="deleteRYXXZP"
+              :file-list="fileList"
+              @after-read="uploadRYXXZP"
+              :show-upload="true"
+          />
+        </li>
+        <li class="detailLi2" >
+          <div class="titleBox" style="margin-bottom: 24rpx">
+            <span class="liName">
+              室内外环境
+            <span style="color: #B3B3B3;font-size: 28rpx">（只能上传jpg/png格式，限制上传6张）</span>
+            </span>
+          </div>
+          <van-uploader
+              :max-count="6"
+              @delete="deleteRYXXZP2"
+              :file-list="fileList2"
+              @after-read="uploadRYXXZP2"
+              :show-upload="true"
+          />
+        </li>
+        <li class="detailLi2" style="position:relative;">
+          <div class="titleBox" >
+            <span class="liName">出租位置</span>
+          </div>
+          <van-field
+              autosize
+              type="textarea"
+              placeholder="请选择地址"
+              class="myField"
+              style="padding-right: 120rpx;box-sizing: border-box"
+          />
+          <div class="locationBox">
+            <van-icon name="location" />
+            地图
+          </div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">
+            当前可用状态
+          </span>
+        <div class="inputBox">
+          <input placeholder="请选择" disabled class="myIpt">
+          <van-icon name="arrow-down" />
+        </div>
+        </li>
+        <li class="detailLi" style="border-bottom: none">
+          <span class="liName">
+            租赁状态
+          </span>
+        <div class="inputBox">
+          <input placeholder="请选择" disabled class="myIpt">
+          <van-icon name="arrow-down" />
+        </div>
+        </li>
+      </ul>
+      <button class="commitBtn">保存</button>
+      <van-popup
+          :show="show"
+          position="bottom"
+          custom-style="height: 50%;"
+      >
+        <van-picker :columns="columns" show-toolbar @cancel="show=false" @confirm="onConfirm" />
+      </van-popup>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "propertyEditor",
+  data(){
+    return{
+      fileList: [],
+      fileList2: [],
+      show:false,
+      columns: ['杭州', '宁波', '温州', '嘉兴', '湖州']
+    }
+  },
+  methods:{
+    showPop(e){
+      this.show = true
+    },
+    onConfirm(e){
+      console.log(e)
+      this.show = false
+    },
+    deleteRYXXZP(event) {
+      this.fileList.splice(event.detail.index, 1);
+      this.$forceUpdate();
+    },
+    deleteRYXXZP2(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) {},
+      });
+    },
+    uploadRYXXZP2(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">
+.propertyEditor{
+  padding-bottom: 150rpx;
+  .detailUl{
+    margin-top: 20rpx;
+    background: white;
+    padding: 24rpx 32rpx;
+    .liName{
+      font-size: 32rpx;
+      color: rgba(51, 51, 51, 1);
+      white-space: nowrap;
+      .callNumber{
+        color: rgba(24, 23, 42, 1);
+        font-size: 36rpx;
+        font-weight: 600;
+      }
+      .callName{
+        color: rgba(102, 102, 102, 1);
+        font-size: 28rpx;
+      }
+    }
+    .phoneIcon{
+      width: 64rpx;
+      height: 64rpx;
+    }
+    .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;
+        overflow: hidden;
+        word-wrap: break-word;
+      }
+      .inputBox{
+        display: flex;
+        align-items: center;
+      }
+      .myIpt{
+        text-align: right;
+        margin-right: 20rpx;
+        color: rgba(102, 102, 102, 1);
+      }
+    }
+    .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: 128rpx;
+          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;
+        }
+      }
+      .locationBox{
+        position: absolute;
+        right: 24rpx;
+        top: 100rpx;
+      }
+      .van-cell {
+        background: #F5F7FA !important;
+        border-radius: 8rpx;
+        font-size: 28rpx;
+        margin-top: 16rpx;
+      }
+    }
+  }
+  .commitBtn{
+    width: 654rpx;
+    height: 96rpx;
+    background: rgba(3, 101, 249, 1);
+    margin: 64rpx 48rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36rpx;
+    color: white;
+  }
+}
+</style>

pages/subPackages/reportRepair/repairDetail.vue

@@ -1,378 +1,559 @@
 <template>
-  <div class="repair-detail-box">
-    <div
-      :class="[
-        'repair-content',
-        detailStatus === 'processed' ? 'fixed-page-content' : 'page-content',
-      ]"
-    >
-      <div class="white-box page-1">
-        <div class="cell-item">
-          <p class="label">当前企业</p>
-          <p class="tit">{{ detail.companyName }}</p>
-        </div>
-        <div class="cell-item">
-          <p class="label">您是想</p>
-          <div class="tit">{{ detail.type==='1'?'报事':'咨询' }}</div>
-        </div>
-        <div class="cell-item">
-          <p class="label">快捷选择</p>
-          <div class="tit">{{ detail.serviceType }}</div>
-        </div>
-        <div class="block-cell-item">
-          <p class="label">报事报修描述</p>
-          <div class="tit">
-            <div class="textarea">
-              {{detail.description}}
+  <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>
-        </div>
-      </div>
-      <div class="white-box page-2">
-        <div class="cell-item">
-          <p class="label">位置</p>
-          <div class="tit">{{ detail.position==='1'?'室内':'公区' }}</div>
-        </div>
-        <div class="block-cell-item">
-          <p class="label">补充说明</p>
-          <div class="tit">
-            <ul class="annex-list-box">
-              <li
-                class="annex-item"
-                v-for="(item, index) in explainAnnexList"
-                :key="index"
-              >
-                <img :src="item.url" alt="" v-if="item.type === 'image'" />
-                <video
-                  :src="item.url"
-                  v-if="item.type === 'video'"
-                  width="100%"
-                  height="100%"
-                ></video>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div class="cell-item flex-item">
-          <p class="label">报事人</p>
-          <p class="tit tel-box">
-            <span>{{ detail.userPhone }}</span>
-            <TelNum :num="detail.phone" :showTel="false" />
-          </p>
-        </div>
-        <div class="cell-item">
-          <p class="label">报事时间</p>
-          <p class="tit">{{ detail.createdAt }}</p>
-        </div>
-      </div>
-      <div class="white-box page-3">
-        <div class="custom-item-tit">
-          <p class="tit">处理情况</p>
-        </div>
-        <div class="block-cell-item">
-          <p class="label">处理进展</p>
-          <div class="tit">
-            <van-steps :active="stepActive" :active-color="'#6600FF'">
-              <van-step v-for="(item, index) in processSteps" :key="index">{{
-                item.label
-              }}</van-step>
-            </van-steps>
+        </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="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>
-        <div class="block-cell-item">
-          <p class="label">
-            处理后拍照<span class="tips">（支持图片上传限20M内，最多6张）</span>
-          </p>
-          <div class="tit">
-            <ul class="annex-list-box">
-              <li
-                class="annex-item"
-                v-for="(item, index) in processedAnnexList"
-                :key="index"
-              >
-                <img :src="item.url" alt="" v-if="item.type === 'image'" />
-                <video
-                  :src="item.url"
-                  v-if="item.type === 'video'"
-                  width="100%"
-                  height="100%"
-                ></video>
-              </li>
-            </ul>
-          </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>
-        <div class="cell-item flex-item">
-          <p class="label">结案人</p>
-          <p class="tit tel-box">
-            <span>{{ detail.handleUserId }}</span>
-            <TelNum :num="detail.hanleUserPhone" :showTel="false" />
-          </p>
+        <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>
-        <div class="cell-item">
-          <p class="label">结案时间</p>
-          <p class="tit">{{detail.handleTime}}</p>
+        <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="white-box page-4" v-if="detailStatus === 'processed'||detailStatus === 'evaluated'">
-        <div class="custom-item-tit">
-          <p class="tit">服务评价</p>
-        </div>
-        <div class="custom-white-box-content">
-          <div class="evaluate-box">
-            <p class="evaluate-left">您对本次服务的评价</p>
-            <div class="evaluate-right">
-              <van-rate v-model="evaluateVal" color="#ffd21e" :readonly="detailStatus !== 'processed'"/>
-            </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>
-        </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="repair-bottom bottom-button" v-if="detailStatus === 'processed'">
-      <button class="btn" @click="onConfirm">评价提交</button>
+    <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 TelNum from '@/components/tel-number'
-import { getById } from '../../service/api_repair'
-import Base from '@/pages/base/base'
-import { editRepair } from '@/service/api_repair'
-import { Toast } from 'vant'
 export default {
-    components: {
-        TelNum
+  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:'',
+      timeNow:'',
+      value: "5"
+    }
+  },
+  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: '报修派单',
+      });
+    }
+  },
+  mounted(){
+    this.getTime()
+  },
+  methods:{
+    // toRecord() {
+    //   uni.navigateTo({
+    //     url:'/pages/subPackages/reportRepair/repairRecord'
+    //   })
+    // },
+    getTime(){
+
+      let timestamp = new Date().getTime();
+      let dateStr = new Date().toLocaleDateString();
+      console.log(dateStr);
+
+      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
     },
-    data() {
-        return {
-            dc_key: ['QUICK_SELECTION', 'REPAIR_STATUS'],
-            detailId: '', // 详情id
-            detailStatus: '', // 详情状态：0、待受理 1、已受理 2、已处理  3、已评价
-            explainAnnexList: [
-                // {
-                //     type: 'image',
-                //     url: require('../../assets/image/reportRepair/shuibiao.jpeg')
-                // }
-            ], // 说明附件 type image、图片 video、视频
-            processedAnnexList: [
-                // {
-                //     type: 'image',
-                //     url: require('../../assets/image/reportRepair/shuibiao.jpeg')
-                // }
-            ], // 附件 type image、图片 video、视频
-            stepActive: 0, // 当前处理到哪一步
-            processSteps: [
-                {
-                    id: 1,
-                    status: 1,
-                    label: '上报'
-                },
-                {
-                    id: 2,
-                    status: 1,
-                    label: '已受理'
-                },
-                {
-                    id: 3,
-                    status: 1,
-                    label: '已处理'
-                },
-                {
-                    id: 4,
-                    status: 0,
-                    label: '评价'
-                }
-            ], // 处理流程
-            evaluateVal: 0, // 评分
-            id: '',
-            detail: {},
-            fileUrlList: [],
-            params: {
-                id: '',
-                evaluateNum: '',
-                score: ''
-            }
-        }
+    closePage() {
+      uni.navigateTo({
+        url:'/pages/subPackages/todo/repairAcceptance'
+      })
     },
-    mixins: [Base],
-    mounted() {
-        this.id = this.$route.query.id
-        this.initDict(this.dc_key).then((res) => {
-            this.getDetailById()
-        })
+    clickCheck(item){
+      item.isCheck = !item.isCheck
     },
-    methods: {
-        onConfirm(value) {
-            this.params.evaluateNum = this.params.evaluateNum + 1
-            this.params.score = this.params.score + this.evaluateVal
-            this.params.status = 'evaluated'
-            editRepair(this.params).then((res) => {
-                Toast.success('评价成功')
-                this.$router.push({ path: 'repairRecord',
-                    query: { type: this.detail.type }
-                })
-            })
-        },
-        getDetailById() {
-            const _this = this
-            getById({ id: _this.id }).then((res) => {
-                console.log(res.data)
-                if (res.data) {
-                    const det = _this.getItemJson(res.data)
-                    this.detail = det
-                    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))
-                }
-                // const item = _this.getItemJson(res)
-            })
-        },
-        getItemJson: function(item) {
-            item.releaseTime = this.$common.transDate(item.releaseTime)
-            item.createdAt = this.$common.transDate(item.createdAt)
-            item.serviceType = this.dc_map.QUICK_SELECTION[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
-            }
-            const fileUrls = this.$common.castEval(item.fileUrl)
-            const fileUrl = []
-            if (fileUrls !== null && fileUrls.length > 0) {
-                fileUrls.forEach(item => {
-                    if (item.url) {
-                        const ul = {
-                            type: 'image',
-                            url: item.url.replace('/server', '/smartParkH5Server')
-                        }
-                        fileUrl.push(ul)
-                    }
-                })
-            }
-            item.fileUrlList = fileUrl
-
-            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
-            return item
-        },
-        /**
-     *
-     */
-        quickSelect(item) {
-            if (this.quickSleced.val && this.quickSleced.val === item.val) {
-                this.quickSleced = {}
-            } else {
-                this.quickSleced = item
-            }
+    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,
+          });
         },
-        /**
-     * 上传文件
-     */
-        afterRead(file) {
-            console.log(file)
-        }
-    }
+        fail(res) {},
+      });
+    },
+  }
 }
 </script>
-<style lang="scss" scoped>
-.repair-detail-box {
-  width: 100%;
-  height: 100%;
-  .page-1 {
-    .textarea {
-      padding: 20px;
-      border-radius: 10px;
-      background: $page-color-base;
-      box-sizing: border-box;
-    }
-  }
-  .page-4 {
-    .evaluate-box {
-      padding: 20px 30px;
-      background: $page-color-base;
-      border: 1px solid #ebedf0;
-      border-radius: 100px;
+<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: space-between;
-      box-sizing: border-box;
+      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;
+          }
+        }
+      }
     }
   }
-  .annex-list-box {
+  .van-cell {
+    background: #F5F7FA !important;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+  }
+  .buttonBox{
     display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    &::after {
-      display: block;
-      content: "";
-      width: 30%;
-      height: 0px;
+    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;
     }
-    .annex-item {
-      width: 30%;
-      height: 180px;
-      border: 1px solid $text4;
-      margin-bottom: 20px;
-      position: relative;
-      overflow: hidden;
-      > img {
-        width: 100%;
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        margin: auto;
-        display: block;
+    .zcBtn{
+      background: rgba(0, 0, 0, 0.05);
+      color: rgba(3, 101, 249, 1);
+      &::after{
+        border: none;
       }
-      video {
-        width: 100%;
-        height: 100%;
+    }
+    .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;
   }
-  .tel-box {
+  .evaluationBox {
+    width: 686rpx;
+    height: 100rpx;
+    padding: 0 24rpx;
     display: flex;
     align-items: center;
-    /deep/ .custom-tel-component {
-      margin-left: 20px;
+    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);
     }
   }
 }

pages/subPackages/reportRepair/repairRecord.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="repair-record-box">
     <ul class="custom-list-box">
-      <li class="customLi" v-for="item in recordList">
+      <li class="customLi" v-for="item in recordList" @tap="toDetail(item)">
           <div class="firstRow">
             <span class="rowTitle">{{ item.title }}</span>
-            <span class="rowTags" :class="item.tag==='已处理'?'yclTags':item.tag==='暂存'?'zcTags':''">{{item.tag}}</span>
+            <span class="rowTags" :class="item.type==='已处理'?'yclTags':item.type==='暂存'?'zcTags':''">{{item.type}}</span>
           </div>
           <div class="secondRow">
             <img src="https://www.idea-co-sf.com/gardenProduct/image/componeyIcon.png" class="componeyIcon">
@@ -20,13 +20,20 @@ export default {
     data(){
       return{
         recordList:[
-          {title:'上月水费不太对，怀疑水表异常',tag:'已受理'},
-          {title:'空调坏了，不能使用',tag:'已受理'},
-          {title:'办公室灯泡坏了2个',tag:'已处理'},
-          {title:'厕所水龙头坏了，不出水',tag:'暂存'},
+          {title:'上月水费不太对，怀疑水表异常',type:'已受理'},
+          {title:'空调坏了，不能使用',type:'已受理'},
+          {title:'办公室灯泡坏了2个',type:'已处理'},
+          {title:'厕所水龙头坏了，不出水',type:'暂存'},
         ]
       }
+    },
+  methods:{
+    toDetail(item){
+      uni.navigateTo({
+        url:'/pages/subPackages/reportRepair/repairDetail?type=' + item.type
+      })
     }
+  }
 }
 </script>
 <style lang="scss" scoped>

pages/subPackages/resourceReservation_manage/detail.vue

@@ -26,7 +26,7 @@
             <span class="callName">预约电话：</span>
             <span class="callNumber">0510-680**808</span>
           </span>
-          <img src="../minePages/image/phoneIcon.png" class="phoneIcon">
+          <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
         </li>
       </ul>
       <div class="timeBox">

pages/subPackages/serviceEvaluation/index.vue

@@ -0,0 +1,145 @@
+<template>
+    <div class="serviceEvaluation">
+       <div class="serviceBody">
+         <div class="serviceTitle">请给出您能园区服务水平的评价，您的建议是我们前进的最大动力!</div>
+         <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 class="evaluationBox" >
+           <span class="evaName">园区绿化</span>
+           <van-rate
+               :value="value"
+               :size="24"
+               gutter="32rpx"
+               void-color="#eee"
+               bind:change="onChange"
+               color="#fd9a63"
+           />
+         </div>
+         <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 class="evaluationBox" >
+           <span class="evaName">停车服务</span>
+           <van-rate
+               :value="value"
+               :size="24"
+               gutter="32rpx"
+               void-color="#eee"
+               bind:change="onChange"
+               color="#fd9a63"
+           />
+         </div>
+         <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 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="serviceBody">
+        <van-field
+            :value="form.contant"
+            autosize
+            type="textarea"
+            placeholder="请输入文字进行报事报修描述"
+            class="myField"
+            maxlength="2000"
+            show-word-limit
+        />
+      </div>
+      <button class="submitBtn">提交</button>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data(){
+    return{
+      value: "5",
+      form:{
+
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .serviceEvaluation{
+      .serviceBody{
+        background: white;
+        padding: 24rpx 32rpx;
+        margin: 24rpx 0;
+        .serviceTitle{
+          color: rgba(51, 51, 51, 1);
+          font-size: 28rpx;
+        }
+      }
+      .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);
+        }
+      }
+      .van-cell {
+        background: #F5F7FA !important;
+        border-radius: 8rpx;
+        font-size: 28rpx;
+      }
+      .submitBtn{
+        width: 654rpx;
+        height: 96rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: white;
+        font-size: 35rpx;
+        background: rgba(3, 101, 249, 1);
+        margin: 64rpx auto;
+      }
+    }
+</style>

pages/subPackages/todo/dispatch.vue

@@ -73,7 +73,7 @@
             报事人
           </span>
           <span class="liInfo">
-            章敏-18915281562 <img src="../parkActivity/image/phoneIcon.png" class="phoneIcon">
+            章敏-18915281562 <img src="https://www.idea-co-sf.com/gardenProduct/image/phoneIcon.png" class="phoneIcon">
           </span>
         </li>
         <li class="detailLi" style="border-bottom: none">
@@ -90,38 +90,96 @@
        <div class="handleTitle">处理情况</div>
        <div class="imageBox">
          <div class="imageItem">
-           <img src="./image/upImage.svg" class="handleImg">
+           <img src="https://www.idea-co-sf.com/gardenProduct/image/upImage.svg" class="handleImg">
            <span>上报</span>
          </div>
-         <img src="./image/arrow.png" class="handleArrow">
+         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
          <div class="imageItem">
-            <img src="./image/acceptance.svg" class="handleImg">
+            <img src="https://www.idea-co-sf.com/gardenProduct/image/acceptance.svg" class="handleImg">
             <span>受理</span>
          </div>
-         <img src="./image/arrow.png" class="handleArrow">
+         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
          <div class="imageItem">
-             <img :src="optionsType==='待受理'?require('./image/unHandle.svg'):require('./image/handle.svg')" class="handleImg">
+             <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="./image/arrow.png" class="handleArrow">
+         <img src="https://www.idea-co-sf.com/gardenProduct/image/arrow.png" class="handleArrow">
          <div class="imageItem">
-            <img src="./image/evaluate.svg" class="handleImg">
+            <img src="https://www.idea-co-sf.com/gardenProduct/image/evaluate.svg" class="handleImg">
             <span>评价</span>
          </div>
        </div>
     </div>
-    <div class="reportBody">
+    <div class="reportBody" v-if="optionsType!=='已处理'">
       <ul class="detailUl">
         <li class="detailLi">
            <span class="liInfo">
               <label>
-                  <radio value="报事" :checked="true" color="#0365F9" />派单
+                  <radio value="报事" :checked="optionsType==='待受理'" color="#0365F9" :disabled="optionsType==='待处理'"/>派单
               </label>
               <label style="margin-left: 64rpx">
-                  <radio value="咨询" :checked="false" color="#0365F9" disabled/>处理
+                  <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">
             派单给
@@ -144,6 +202,58 @@
                 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="buttonBox">
@@ -173,7 +283,8 @@ export default {
         {name:'其他维修',isCheck:false},
       ],
       fileList:[],
-      optionsType:''
+      optionsType:'',
+      timeNow:''
     }
   },
   onLoad(options) {
@@ -193,12 +304,31 @@ export default {
       });
     }
   },
+  mounted(){
+    this.getTime()
+  },
   methods:{
     // toRecord() {
     //   uni.navigateTo({
     //     url:'/pages/subPackages/reportRepair/repairRecord'
     //   })
     // },
+    getTime(){
+
+      let timestamp = new Date().getTime();
+      let dateStr = new Date().toLocaleDateString();
+      console.log(dateStr);
+
+      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
+    },
     closePage() {
       uni.navigateTo({
         url:'/pages/subPackages/todo/repairAcceptance'
@@ -368,11 +498,6 @@ export default {
     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;
@@ -396,5 +521,10 @@ export default {
       font-size: 28rpx;
     }
   }
+  .handleTitle{
+    color: rgba(34, 34, 34, 1);
+    font-size: 36rpx;
+    font-weight: 600;
+  }
 }
 </style>

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

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/login/login",
+    "pages/login2/login",
     "pages/index/index",
     "pages/mine/mine"
   ],
@@ -15,6 +16,8 @@
         "activity/index",
         "activity/code",
         "activityPromulgate/list",
+        "activityPromulgate/qrCode",
+        "activityPromulgate/add",
         "password/index",
         "repairDispatch-app/index",
         "repairDispatch-app/add",
@@ -28,6 +31,10 @@
         "modifyReport/add",
         "toread/index",
         "todo/index",
+        "todo/predetermineDetail",
+        "todo/repairAcceptance",
+        "todo/addRepair",
+        "todo/dispatch",
         "venueRoom/confirm",
         "housedetails/housedetails",
         "addintention/addintention",
@@ -37,7 +44,37 @@
         "merchants/merchants",
         "merchants/components/mymechantsdetails",
         "reportRepair/index",
-        "companyreport/companyreport"
+        "reportRepair/repairRecord",
+        "companyreport/companyreport",
+        "economicDevelopmentReport/economic",
+        "enterPriseBill/index",
+        "enterPriseBill/detail",
+        "propertyNotice/index",
+        "propertyNotice/detail",
+        "propertyNotice_manage/index",
+        "propertyNotice_manage/newRelease",
+        "parkActivity/index",
+        "parkActivity/activeApplication",
+        "parkActivity/applicationInfo",
+        "parkActivity/activityCheckIn",
+        "minePages/mineMessage",
+        "minePages/mineInfo",
+        "minePages/feedback",
+        "minePages/feedback_record",
+        "minePages/feedback_detail",
+        "minePages/myActivities",
+        "minePages/myCollection",
+        "minePages/myOrder",
+        "peripheralService/index",
+        "peripheralService/detail",
+        "industrialPolicy/index",
+        "industrialPolicy/detail",
+        "surroundingReleases/index",
+        "resourceReservation_manage/index",
+        "resourceReservation_manage/detail",
+        "resourceReservation_manage/add",
+        "propertyManagement/maintenance",
+        "propertyManagement/propertyEditor"
       ],
       "network": "all"
     }

unpackage/dist/build/mp-weixin/pages/subPackages/components/momo-multipleSelect/momo-multipleSelect.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/project.config.json

@@ -18,7 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.4.2",
+  "libVersion": "3.5.0",
   "appid": "wx15404cced62d7b37",
   "projectname": "产品化管理端",
   "condition": {},

unpackage/dist/build/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
-  },
-  "component": true
+  }
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
-  }
+  },
+  "component": true
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
-  },
-  "component": true
+  }
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }