产品化更新

js_sdk/http.js

@@ -30,6 +30,12 @@ export function loginByWeixin2(code) {
         '/wx/auth/login_by_weixin2',
         code, {}
     )
+}export function switchCommonUser(code) {
+
+    return $http.post(
+        '/wx/auth/switchCommonUser',
+        code, {}
+    )
 }
 export function getUserLocalStorageInfo() {
     const userInfo = JSON.parse(
@@ -619,3 +625,59 @@ export function upload(data) {
         data, {}
     )
 }
+export function newNotice(data) {
+    return $http.post(
+        '/wx/noticePark/newNotice',
+        data, {}
+    )
+}
+export function noticeParkList(data) {
+    return $http.post(
+        '/wx/noticePark/list',
+        data, {}
+    )
+}
+export function propertyNoticeList(data) {
+    return $http.post(
+        '/wx/propertyNotice/list',
+        data, {}
+    )
+}
+export function noticeParkClickCollect(data) {
+    return $http.post(
+        '/wx/noticePark/clickCollect',
+        data, {}
+    )
+}
+export function propertyNoticeClickCollect(data) {
+    return $http.post(
+        '/wx/propertyNotice/clickCollect ',
+        data, {}
+    )
+}
+export function userNoticeAdd(data) {
+    return $http.post(
+        '/wx/userNotice/add',
+        data, {}
+    )
+}
+// 园区通知发布
+export function noticeParkAdd(data) {
+    return $http.post(
+        '/wx/noticePark/add',
+        data, {}
+    )
+}
+export function noticeParkGetById(data) {
+    return $http.post(
+        '/wx/noticePark/getById',
+        data, {}
+    )
+}
+// 园区通知编辑
+export function noticeParkEdit(data) {
+    return $http.post(
+        '/wx/noticePark/edit',
+        data, {}
+    )
+}

pages.json

@@ -2650,6 +2650,43 @@
                             "van-swipe-cell": "/wxcomponents/weapp/dist/swipe-cell/index"
                         }
                     }
+                },
+                {
+                    "path": "todo/resourceReview",
+                    "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

@@ -28,11 +28,11 @@
     <div class="noticeBody">
       <image :src="tongzhi" class="tongzhiImg"></image>
       <div class="columLine"></div>
-      <div class="noticeBox" @click="toNotice">
-        <div class="noticeItem" v-for="item in 2">
-          <div class="noticeTag">物业</div>
-          <div class="noticeInfo">新年伊始，PAER招商开始啦啦啦啦啦啦</div>
-          <div class="noticeTime">1小时前</div>
+      <div class="noticeBox">
+        <div class="noticeItem" v-for="item in noticeList" @click="toNotice(item)">
+          <div class="noticeTag">{{item.type=='1'?'园区':'物业'}}</div>
+          <div class="noticeInfo">{{item.title}}</div>
+          <div class="noticeTime">{{item.time}}</div>
         </div>
       </div>
     </div>
@@ -95,7 +95,7 @@
 import vanRate from "../../../wxcomponents/weapp/dist/rate/index";
 import dynamic from "./dynamic.vue";
 import Activity from "./activity.vue";
-import { getUserPower, getUserLocalStorageInfo } from "@/js_sdk/http";
+import { getUserPower, getUserLocalStorageInfo, newNotice} from "@/js_sdk/http";
 export default {
   components: {
     Activity,
@@ -105,6 +105,7 @@ export default {
   name: "enterpriseSide",
   data() {
     return {
+      noticeList:[],
       faMsg:'home',
       locationIcon:
         "https://www.idea-co-sf.com/gardenProduct/image/locationIcon.png",
@@ -191,16 +192,70 @@ export default {
       ],
     };
   },
+  mounted() {
+    this.getNotice()
+  },
   methods: {
+    getNotice(){
+      newNotice().then(res=>{
+        const newNotice = res.data
+        newNotice.forEach(e=>{
+          e.time = this.showtime(e.releaseTime)
+        })
+        this.noticeList.push(...res.data)
+      })
+    },
+    showtime(time) {
+      const date =
+          typeof time === 'number'
+              ? new Date(time)
+              : new Date((time || '').replace(/-/g, '/'))
+      const diff = (new Date().getTime() - date.getTime()) / 1000
+      const dayDiff = Math.floor(diff / 86400)
+      const isValidDate =
+          Object.prototype.toString.call(date) === '[object Date]' &&
+          !isNaN(date.getTime())
+
+      if (!isValidDate) {
+        window.console.error('不是有效日期格式')
+      }
+      const formatDate = function(date) {
+        const today = new Date(date)
+        const year = today.getFullYear()
+        const month = ('0' + (today.getMonth() + 1)).slice(-2)
+        const day = ('0' + today.getDate()).slice(-2)
+        const hour = today.getHours()
+        const minute = today.getMinutes()
+        const second = today.getSeconds()
+        return `${year}-${month}-${day} ${hour}:${minute}:${second}`
+      }
+
+      if (isNaN(dayDiff) || dayDiff < 0) {
+        return formatDate(date)
+      }
+      return (
+          (dayDiff === 0 &&
+              ((diff < 60 && '刚刚') ||
+                  (diff < 120 && '1分钟前') ||
+                  (diff < 3600 && Math.floor(diff / 60) + '分钟前') ||
+                  (diff < 7200 && '1小时前') ||
+                  (diff < 86400 && Math.floor(diff / 3600) + '小时前'))) ||
+          (dayDiff === 1 && '昨天') ||
+          (dayDiff < 7 && dayDiff + '天前') ||
+          (dayDiff < 31 && Math.ceil(dayDiff / 7) + '周前') ||
+          (dayDiff >= 31 && Math.ceil((dayDiff - 30) / 31) + '月前')
+      )
+    },
     toServiceEva(){
       uni.navigateTo({
         url:"/pages/subPackages/serviceEvaluation/index",
       })
     },
-    toNotice() {
-      uni.navigateTo({
-        url:"/pages/subPackages/propertyNotice/index",
-      })
+    toNotice(item) {
+       // 跳转传参
+        uni.navigateTo({
+          url:"/pages/subPackages/propertyNotice/index?type=" + item.type,
+        })
     },
     bindPickerChange(e) {
       console.log(e);
@@ -366,6 +421,9 @@ export default {
           color: #0365f9;
           font-size: 22rpx;
           text-align: center;
+          display: flex;
+          align-items: center;
+          justify-content: center;
         }
         .noticeInfo {
           width: 326rpx;

pages/index/index.vue

@@ -155,9 +155,14 @@ export default {
         //   // path: "",
         // },
         {
-          label: "通知发布",
+          label: "物业通知",
           url: "https://www.idea-co-sf.com/gardenProduct/image/tupian2.png",
-          path: "/pages/subPackages/propertyNotice_manage/index",
+          path: "/pages/subPackages/propertyNotice_manage/index?type=2",
+        },
+        {
+          label: "园区通知",
+          url: "https://www.idea-co-sf.com/gardenProduct/image/tupian2.png",
+          path: "/pages/subPackages/propertyNotice_manage/index?type=1",
         },
         {
           label: "活动发布",

pages/login2/login.vue

@@ -342,6 +342,7 @@ export default {
       right: 0 !important;
       width: 20vw;
       height: 10vw;
+      z-index: 10;
     }
     .yanzhengImgBox {
       height: 50px;

pages/mine/mine.vue

@@ -110,7 +110,7 @@
   </view>
 </template>
 <script>
-import { getUserInfo, getUserLocalStorageInfo } from "@/js_sdk/http";
+import { getUserInfo, getUserLocalStorageInfo,switchCommonUser } from "@/js_sdk/http";
 export default {
   data() {
     return {
@@ -181,6 +181,21 @@ export default {
             // uni.$emit('userType', 'OK')
           },
         });
+      }else {
+        let data = {
+          id: this.getUserLocalStorageInfo.id,
+        };
+        switchCommonUser(data).then((e) => {
+          if (e.errno === 0){
+            delete this.getUserLocalStorageInfo.userId
+            this.getUserLocalStorageInfo.userType = '3'
+            this.getUserLocalStorageInfo.username = ''
+            console.log(this.getUserLocalStorageInfo)
+            wx.setStorageSync("USERINFO", JSON.stringify(this.getUserLocalStorageInfo));
+          }
+          // console.log(e.data.user);
+          // uni.clearStorageSync();
+        });
       }
       this.show = false
     },

pages/subPackages/propertyNotice/detail.vue

@@ -15,15 +15,26 @@
 </template>
 
 <script>
+import { userNoticeAdd,getUserLocalStorageInfo } from "@/js_sdk/http";
 export default {
   name: "detail",
   data(){
     return{
-
+      getUserLocalStorageInfo: getUserLocalStorageInfo(),
     }
   },
   onLoad({type}){
-    console.log(JSON.parse(type))
+    // console.log(JSON.parse(type))
+    const item = JSON.parse(type)
+    if(item.readStatus === '1'){
+      userNoticeAdd({
+        noticeId:item.id,
+        userId:this.getUserLocalStorageInfo.userId,
+        type:item.type
+        }).then(res=>{
+
+      })
+    }
   }
 }
 </script>

pages/subPackages/propertyNotice/index.vue

@@ -2,12 +2,12 @@
     <div class="propertyNotice">
       <ul class="noticeUl">
         <li class="noticeLi" v-for="item in noticeList" @tap="toDetail(item)">
-          <img :src="item.isRead?unReadImg:readImg" class="leftImg"/>
+          <img :src="item.readStatus=='1'?unReadImg:readImg" class="leftImg"/>
           <div class="rightBox">
             <span class="noticeTitle">{{item.title}}</span>
             <span class="noticeTimeBox">
-              <span class="noticeTime">2024-06-18  19:34:06</span>
-              <van-icon name="like" :class="item.isLike?'likeIcon':'unLikeIcon'" @tap.stop="clickLike(item)"/>
+              <span class="noticeTime">{{item.releaseTime}}</span>
+              <van-icon name="like" :class="item.collectorsStatus=='2'?'likeIcon':'unLikeIcon'" @tap.stop="clickLike(item)"/>
             </span>
           </div>
         </li>
@@ -16,21 +16,59 @@
 </template>
 
 <script>
+import { noticeParkList,getUserLocalStorageInfo,noticeParkClickCollect,propertyNoticeList,propertyNoticeClickCollect } from "@/js_sdk/http";
+import dayjs from "dayjs";
 export default {
   name: "index",
   data(){
     return {
-      unReadImg:'https://www.idea-co-sf.com/gardenProduct/image/xiaoxi01.png',
-      readImg:'https://www.idea-co-sf.com/gardenProduct/image/xiaoxi02.png',
+      getUserLocalStorageInfo: getUserLocalStorageInfo(),
+      unReadImg:'https://www.idea-co-sf.com/gardenProduct/image/xiaoxi02.png',
+      readImg:'https://www.idea-co-sf.com/gardenProduct/image/xiaoxi01.png',
       noticeList:[
-        { title:'XXXXX南门出口道闸维修的通知', isRead:false, isLike:true },
-        { title:'XXXXXXXX停电的紧急通知', isRead:true, isLike:false },
-        { title:'XXXXX南门出口道闸维修的通知', isRead:false, isLike:true },
-        { title:'关于强降雨天气防范措的通知', isRead:true, isLike:true },
-        { title:'关于无端午节禁止施工的温馨提示', isRead:false, isLike:false },
-        { title:'关于园区枇杷消杀禁止采摘的通知', isRead:false, isLike:true },
-        { title:'关于开展爱邻活动的通知', isRead:true, isLike:false },
-      ]
+        // { title:'XXXXX南门出口道闸维修的通知', isRead:false, isLike:true },
+        // { title:'XXXXXXXX停电的紧急通知', isRead:true, isLike:false },
+        // { title:'XXXXX南门出口道闸维修的通知', isRead:false, isLike:true },
+        // { title:'关于强降雨天气防范措的通知', isRead:true, isLike:true },
+        // { title:'关于无端午节禁止施工的温馨提示', isRead:false, isLike:false },
+        // { title:'关于园区枇杷消杀禁止采摘的通知', isRead:false, isLike:true },
+        // { title:'关于开展爱邻活动的通知', isRead:true, isLike:false },
+      ],
+      type:''
+    }
+  },
+  onLoad(type){
+    // console.log('type',type)
+    this.type = type.type
+    const data = {
+      userId:this.getUserLocalStorageInfo.userId,
+      type:type.type,
+      status:'published'
+    }
+    if (type.type=='1'){
+      uni.setNavigationBarTitle({
+        title: '园区通知',
+      });
+      const dayjs = require('dayjs')
+      noticeParkList(data).then(res=>{
+        res.forEach(e=>{
+          e.releaseTime = dayjs(e.releaseTime).format('YYYY-MM-DD HH:mm:ss')
+          e.type = type.type
+        })
+        this.noticeList = res
+      })
+    }else{
+      uni.setNavigationBarTitle({
+        title: '物业通知',
+      });
+      const dayjs = require('dayjs')
+      propertyNoticeList(data).then(res=>{
+        res.forEach(e=>{
+          e.releaseTime = dayjs(e.releaseTime).format('YYYY-MM-DD HH:mm:ss')
+          e.type = type.type
+        })
+        this.noticeList = res
+      })
     }
   },
   methods:{
@@ -40,7 +78,23 @@ export default {
       });
     },
     clickLike(item){
-      item.isLike = !item.isLike
+      if (item.collectorsStatus == '1'){
+        item.collectorsStatus = '2'
+      }else{
+        item.collectorsStatus = '1'
+      }
+      const data = {
+        id:item.id,
+        userId:this.getUserLocalStorageInfo.userId,
+        collectorsStatus:item.collectorsStatus
+      }
+      if (this.type === '1'){
+        noticeParkClickCollect(data).then(res=>{
+        })
+      }else{
+        propertyNoticeClickCollect(data).then(res=>{
+        })
+      }
     }
   }
 }

pages/subPackages/propertyNotice_manage/index.vue

@@ -3,12 +3,12 @@
     <div class="whiteBoard">
       <div class="addRepair" @tap="newRelease">新增发布 <van-icon name="add" style="margin-left: 8rpx"/></div>
       <div class="noticeItem" v-for="item in repairList">
-        <div class="noticeName">{{item.name}}</div>
+        <div class="noticeName">{{item.title}}</div>
         <div class="noticeBottom">
-          <div class="noticeTime">{{item.time}}</div>
+          <div class="noticeTime">{{item.releaseTime}}</div>
           <div class="noticeBtnBox">
-            <button class="mbtn editBtn">编辑</button>
-            <button class="mbtn closeBtn">下架</button>
+            <button class="mbtn editBtn" @tap="editClick(item)">编辑</button>
+            <button class="mbtn closeBtn" @tap="changeType(item)">{{ item.status === 'published'?'下架':'上架' }}</button>
           </div>
         </div>
       </div>
@@ -17,21 +17,81 @@
 </template>
 
 <script>
+import dayjs from "dayjs";
+import { noticeParkList,propertyNoticeList,getUserLocalStorageInfo, noticeParkEdit } from "@/js_sdk/http";
+
+
 export default {
   name: "index",
   data(){
     return{
+      getUserLocalStorageInfo: getUserLocalStorageInfo(),
+      type:'',
       repairList:[
-        {name:'关于组织2020年无锡市服务业提质增效资金项目申报的通知',time:'2024-1-21  13:00'},
-        {name:'关于组织2020年无锡市服务业提质增效资金项目申报的通知',time:'2024-1-21  13:00'},
-        {name:'关于组织2020年无锡市',time:'2024-1-21  13:00'},
+        // {name:'关于组织2020年无锡市服务业提质增效资金项目申报的通知',time:'2024-1-21  13:00'},
+        // {name:'关于组织2020年无锡市服务业提质增效资金项目申报的通知',time:'2024-1-21  13:00'},
+        // {name:'关于组织2020年无锡市',time:'2024-1-21  13:00'},
       ]
     }
   },
+  onLoad(type){
+    // console.log('type',type)
+    this.type = type.type
+    const data = {
+      userId:this.getUserLocalStorageInfo.userId,
+      type:type.type,
+      status:''
+    }
+    if (type.type=='1'){
+      uni.setNavigationBarTitle({
+        title: '园区通知',
+      });
+      const dayjs = require('dayjs')
+      noticeParkList(data).then(res=>{
+        if (res.length) {
+          res.forEach(e => {
+            e.releaseTime = dayjs(e.releaseTime).format('YYYY-MM-DD HH:mm:ss')
+            e.type = type.type
+          })
+          this.repairList = res
+        }
+      })
+    }else{
+      uni.setNavigationBarTitle({
+        title: '物业通知',
+      });
+      const dayjs = require('dayjs')
+      propertyNoticeList(data).then(res=>{
+        if (res.length){
+          res.forEach(e=>{
+            e.releaseTime = dayjs(e.releaseTime).format('YYYY-MM-DD HH:mm:ss')
+            e.type = type.type
+          })
+          this.repairList = res
+        }
+      })
+    }
+  },
   methods:{
     newRelease(){
       uni.navigateTo({
-        url:'/pages/subPackages/propertyNotice_manage/newRelease'
+        url:'/pages/subPackages/propertyNotice_manage/newRelease?addType=' + '发布' + '&noticeType=' + this.type
+      })
+    },
+    editClick(item) {
+      uni.navigateTo({
+        url:'/pages/subPackages/propertyNotice_manage/newRelease?addType=' + '编辑' + '&id=' + item.id+ '&noticeType=' + this.type
+      })
+    },
+    changeType(item) {
+      let status = ''
+      if(item.status === 'published'){
+        status = 'off_shelf'
+      }else {
+        status = 'published'
+      }
+      noticeParkEdit({id:item.id,status}).then(res=>{
+
       })
     }
   }
@@ -56,7 +116,6 @@ export default {
       .noticeItem{
         padding: 24rpx 32rpx;
         width: 686rpx;
-        height: 224rpx;
         background: rgba(245, 247, 250, 1);
         box-sizing: border-box;
         border-radius: 16rpx;
@@ -86,6 +145,9 @@ export default {
               align-items: center;
               justify-content: center;
               font-size: 28rpx;
+              &::after{
+                border: none;
+              }
             }
             .editBtn{
               border: 1px solid rgba(3, 101, 249, 1);

pages/subPackages/propertyNotice_manage/newRelease.vue

@@ -4,13 +4,14 @@
            <li class="predetermineLi2">
              <div class="liName">标题</div>
              <van-field
-                 :value="postData.constant"
+                 :value="postData.title"
                  autosize
                  type="textarea"
                  placeholder="请输入"
                  class="myField"
                  maxlength="50"
                  show-word-limit
+                 @input="onInput"
              />
            </li>
            <li class="predetermineLi2" style="border-bottom: none">
@@ -31,33 +32,123 @@
                <span class="liName">内容</span>
              </div>
              <van-field
-                 :value="postData.constant"
+                 :value="postData.content"
                  autosize
                  type="textarea"
                  placeholder="请输入"
                  class="myField"
                  maxlength="1000"
                  show-word-limit
+                 @input="onInput2"
              />
            </li>
          </ul>
-       <div class="buttonBox">
-         <button class="btn zcBtn">暂存</button>
-         <button class="btn tjBtn">发布</button>
+       <div class="buttonBox" >
+         <button class="btn zcBtn" @tap="commitCliack">暂存</button>
+         <button class="btn tjBtn" @tap="addClick">发布</button>
        </div>
      </div>
 </template>
 
 <script>
+import { noticeParkAdd,getUserLocalStorageInfo,noticeParkGetById,noticeParkEdit } from "@/js_sdk/http";
+import dayjs from "dayjs";
 export default {
   name: "newRelease",
   data(){
     return{
-      postData:{},
+      postData:{
+        content:'',
+        title:'',
+        createdBy: getUserLocalStorageInfo().userId,
+        source:'2',
+        status:''
+      },
       fileList:[],
+      addType: '',
+      type:''
+    }
+  },
+  onLoad(type){
+    console.log(type)
+    this.type = type.noticeType
+    this.addType = type.addType
+    if (type.id){
+      noticeParkGetById({id:type.id}).then(res=>{
+        console.log(res)
+        this.postData = res.data
+      })
     }
   },
   methods:{
+    onInput(event){
+      console.log(event)
+      this.postData.title = event.detail;
+    },
+    onInput2(event){
+      this.postData.content = event.detail;
+    },
+    addClick() {
+      const dayjs = require('dayjs')
+      this.postData.releaseTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      this.postData.status = 'published'
+      if (this.addType === '发布'){
+        // console.log(this.postData)
+        noticeParkAdd(this.postData).then(res=>{
+          if (res.code == '200'){
+            uni.reLaunch({
+              url:'/pages/subPackages/propertyNotice_manage/index?type=' + this.type
+            })
+            uni.showToast({
+              title: '操作成功',
+              duration: 500
+            });
+          }
+        })
+      }else if(this.addType === '编辑'){
+        noticeParkEdit(this.postData).then(res=>{
+          if (res.code == '200'){
+            uni.reLaunch({
+              url:'/pages/subPackages/propertyNotice_manage/index?type=' + this.type
+            })
+            uni.showToast({
+              title: '操作成功',
+              duration: 500
+            });
+          }
+        })
+      }
+    },
+    commitCliack() {
+      const dayjs = require('dayjs')
+      if (this.addType === '发布'){
+        this.postData.releaseTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        this.postData.status = 'unpublished'
+        noticeParkAdd(this.postData).then(res=>{
+          if (res.code == '200'){
+            uni.reLaunch({
+              url:'/pages/subPackages/propertyNotice_manage/index?type=' + this.type
+            })
+            uni.showToast({
+              title: '操作成功',
+              duration: 500
+            });
+          }
+        })
+      }else if(this.addType === '编辑'){
+        noticeParkEdit(this.postData).then(res=>{
+           if (res.code == '200'){
+             uni.reLaunch({
+               url:'/pages/subPackages/propertyNotice_manage/index?type=' + this.type
+             })
+             uni.showToast({
+               title: '操作成功',
+               duration: 500
+             });
+           }
+        })
+      }
+    },
     deleteRYXXZP(event) {
       this.fileList.splice(event.detail.index, 1);
       this.$forceUpdate();

pages/subPackages/todo/index.vue

@@ -21,6 +21,7 @@ export default {
         {name:'上月水费不太对，怀疑水表',tag:'报事报修-处理'},
         {name:'XXXXXXX企业入库审核',tag:'企业入库审核'},
         {name:'2024年01月26日~2024年...',tag:'企业房源预定'},
+        {name:'XXXXXXX',tag:'资源预约审核'},
       ]
     };
   },
@@ -34,6 +35,10 @@ export default {
         uni.navigateTo({
           url:'/pages/subPackages/todo/repairAcceptance'
         })
+      }else if(item.tag.includes('资源预约审核')){
+        uni.navigateTo({
+          url:'/pages/subPackages/todo/resourceReview'
+        })
       }
     }
   }

pages/subPackages/todo/resourceReview.vue

@@ -0,0 +1,330 @@
+<template>
+    <div class="resourceReview">
+      <ul class="detailUl">
+        <li class="topBox">
+          <div class="topTitle">会议室详情</div>
+        </li>
+        <li class="detailLi">
+          <span class="liName">当前企业</span>
+          <span class="liInfo">无锡XXXXX有限公司</span>
+        </li>
+        <li class="detailLi">
+          <span class="liName">位置</span>
+          <span class="liInfo">XXXXXXXXXXXXXXXXX</span>
+        </li>
+        <li class="detailLi">
+          <span class="liName">容纳人数</span>
+          <span class="liInfo">120</span>
+        </li>
+        <li class="detailLi">
+          <span class="liName">配套</span>
+          <span class="liInfo">XXXX</span>
+        </li>
+        <li class="detailLi" style="border-bottom: none">
+          <span class="liName">说明</span>
+          <span class="liInfo">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span>
+        </li>
+      </ul>
+      <div class="resourceAddDetail">
+        <ul class="predetermineUl">
+          <li class="topBox">
+            <div class="topTitle" style="padding: 48rpx 0 24rpx 0">预约详情</div>
+            <div class="choosTimeBox">
+              <span class="msg">使用时间</span>
+              <input placeholder="请选择日期" class="choosIpt" disabled>
+              <input placeholder="请选择时间段" class="choosIpt" disabled>
+            </div>
+          </li>
+          <li class="detailLi">
+            <span class="liName">主题</span>
+            <span >
+               <input class="liInfo" placeholder="" v-model="theme" disabled>
+          </span>
+          </li>
+          <li class="detailLi">
+            <span class="liName">容纳人数</span>
+            <span >
+               <input class="liInfo" placeholder="请填写整数">
+          </span>
+          </li>
+          <li class="detailLi">
+            <span class="liName">联系人</span>
+            <span >
+               <input class="liInfo" placeholder="请填写">
+          </span>
+          </li>
+          <li class="detailLi">
+            <span class="liName">联系电话</span>
+            <span >
+               <input class="liInfo" placeholder="请填写">
+          </span>
+          </li>
+          <li class="detailLi2" style="border-bottom: none">
+            <div class="titleBox" >
+              <span class="liName">备注</span>
+            </div>
+            <van-field
+                :value="postData.constant"
+                autosize
+                type="textarea"
+                placeholder="请输入"
+                class="myField"
+                maxlength="2000"
+                show-word-limit
+            />
+          </li>
+        </ul>
+        <ul class="predetermineUl">
+          <li class="detailLi">
+            <span class="liName">预约单位</span>
+            <span >
+               <input class="liInfo" placeholder="" v-model="unit">
+          </span>
+          </li>
+          <li class="detailLi">
+            <span class="liName">容纳人数</span>
+            <span >
+               <input class="liInfo" placeholder="请填写整数">
+          </span>
+          </li>
+          <li class="detailLi">
+            <span class="liName">预约人</span>
+            <span >
+               <input class="liInfo" placeholder="请填写" value="吴凯旋">
+          </span>
+          </li>
+          <li class="detailLi" style="border-bottom: none">
+            <span class="liName">预约时间</span>
+            <span >
+               <input class="liInfo" placeholder="请填写" value="YYYYY-MM-DD  HH:MM ">
+          </span>
+          </li>
+        </ul>
+        <ul class="detailUl">
+          <li class="topBox">
+            <div class="topTitle">审核信息</div>
+          </li>
+          <li class="detailLi2">
+            <van-radio-group :value="radio" @change="onChange">
+              <van-radio name="1">通过</van-radio>
+              <van-radio name="2" style="margin-left: 48rpx">取消</van-radio>
+            </van-radio-group>
+            <van-field
+                :value="postData.constant"
+                autosize
+                type="textarea"
+                placeholder="请输入取消原因（必填）"
+                class="myField"
+                maxlength="200"
+                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">自动带出提交时间（年月日时分秒)</span>
+          </li>
+        </ul>
+        <div class="buttonBox" >
+          <button class="btn zcBtn">暂存</button>
+          <button class="btn tjBtn">提交</button>
+        </div>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "resoureceReview",
+  data() {
+    return{
+      theme:'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+      unit:'XXXXXXXXXXXXXX',
+      postData: {},
+      radio: '1'
+    }
+  },
+  methods:{
+    onChange(){
+
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .resourceReview{
+      .detailUl{
+        margin-top: 20rpx;
+        background: white;
+        padding: 24rpx 32rpx;
+        .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;
+          }
+          .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;
+            }
+          }
+        }
+      }
+      .topBox{
+        background: white;
+        margin: 24rpx 0;
+        .topTitle{
+          color: rgba(34, 34, 34, 1);
+          font-size: 36rpx;
+          font-weight: 600;
+        }
+        .choosTimeBox{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .msg{
+            color: rgba(51, 51, 51, 1);
+            font-size: 32rpx;
+            white-space: nowrap;
+          }
+          .choosIpt{
+            width: 260rpx;
+            height: 96rpx;
+            padding-left: 50rpx;
+            background: rgba(245, 247, 250, 1);
+            box-sizing: border-box;
+          }
+        }
+      }
+      .resourceAddDetail{
+        .predetermineUl{
+          margin: 24rpx 0;
+          background: white;
+          box-sizing: border-box;
+          padding: 0 32rpx;
+          .predetermineLi{
+            padding: 32rpx 0;
+            border-bottom: 1px solid rgba(230, 230, 230, 1);
+            display: flex;
+            justify-content: space-between;
+          }
+          .predetermineLi2{
+            padding: 32rpx 0;
+            border-bottom: 1px solid rgba(230, 230, 230, 1);
+            display: flex;
+            flex-direction: column;
+          }
+          .liName{
+            color: rgba(51, 51, 51, 1);
+            font-size: 32rpx;
+          }
+          .liIpt{
+            color: rgba(102, 102, 102, 1);
+            font-size: 32rpx;
+            text-align: right;
+          }
+          .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: 488rpx;
+              width: 488rpx;
+              color: rgba(102, 102, 102, 1);
+              font-size: 32rpx;
+              line-height: 38rpx;
+              .radio{
+                margin-left: 64rpx;
+              }
+            }
+          }
+        }
+        .detailLi2{
+          display: flex;
+          flex-direction: column;
+          padding: 32rpx 0;
+          border-bottom: 2rpx solid #E6E6E6;
+          .detailLi2BoxTop{
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            margin: 12rpx 0;
+            .checkItem{
+              width: 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;
+            }
+          }
+          .van-radio-group{
+            display: flex;
+          }
+        }
+        .van-cell {
+          background: #F5F7FA !important;
+          border-radius: 8rpx;
+          font-size: 28rpx;
+          margin-top: 16rpx;
+        }
+        .buttonBox{
+          display: flex;
+          justify-content: center;
+          .btn{
+            width: 240rpx;
+            height: 80rpx;
+            display: flex;
+            border-radius: 8rpx;
+            align-items: center;
+            justify-content: center;
+            margin: 48rpx 16rpx 150rpx 16rpx;
+            color: white;
+            letter-spacing: 2rpx;
+            text-indent: 2rpx;
+          }
+          .zcBtn{
+            background: #FE8643;
+          }
+          .tjBtn{
+            background: #0365F9;
+          }
+        }
+      }
+    }
+</style>

pages/utils/constant.js

@@ -1,10 +1,10 @@
 // 系统常量
 // export const BASE_URI = "http://192.168.2.111:9011"; // 正式
-export const BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi'
+// export const BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi'
 // export const BASE_URI = "http://192.168.3.94:9010"; // 老潘本地
 // export const BASE_URI = "http://192.168.2.107:9011"; // 洮洮本地
 // export const BASE_URI = "http://192.168.2.103:9010"; // 老崔本地
-// export const BASE_URI = "http://192.168.2.107:9015"; // 许峰本地
+export const BASE_URI = "http://192.168.2.107:9011"; // 许峰本地
 // export const BASE_URI = "http://192.168.2.112:9010"; // 陈凡本地
 
 export default {

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

@@ -45,6 +45,7 @@
         "merchants/components/mymechantsdetails",
         "reportRepair/index",
         "reportRepair/repairRecord",
+        "reportRepair/repairDetail",
         "companyreport/companyreport",
         "economicDevelopmentReport/economic",
         "enterPriseBill/index",
@@ -74,7 +75,12 @@
         "resourceReservation_manage/detail",
         "resourceReservation_manage/add",
         "propertyManagement/maintenance",
-        "propertyManagement/propertyEditor"
+        "propertyManagement/propertyEditor",
+        "serviceEvaluation/index",
+        "housingResources/index",
+        "housingResources/detail",
+        "housingResources/addPredetermine",
+        "aboutThePark/index"
       ],
       "network": "all"
     }

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-forms/components/uni-forms-item/uni-forms-item.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 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

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

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

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

@@ -80,7 +80,8 @@
         "housingResources/index",
         "housingResources/detail",
         "housingResources/addPredetermine",
-        "aboutThePark/index"
+        "aboutThePark/index",
+        "todo/resourceReview"
       ],
       "network": "all"
     }

unpackage/dist/dev/mp-weixin/pages/index/components/enterpriseSide.wxss

@@ -289,6 +289,9 @@
   color: #0365f9;
   font-size: 22rpx;
   text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .enterpriseSide .noticeBody .noticeBox .noticeItem .noticeInfo {
   width: 326rpx;