共享资源

.idea/workspace.xml

@@ -7,7 +7,7 @@
     <list default="true" id="81506d21-7208-43d6-8644-c0bbfeda7480" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/js_sdk/http.js" beforeDir="false" afterPath="$PROJECT_DIR$/js_sdk/http.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/subPackages/aboutThePark/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/subPackages/aboutThePark/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/subPackages/resourceReservation_manage/add.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/subPackages/resourceReservation_manage/add.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/subPackages/resourceReservation_manage/components/shareResources.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/subPackages/resourceReservation_manage/components/shareResources.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pages/subPackages/resourceReservation_manage/detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/subPackages/resourceReservation_manage/detail.vue" afterDir="false" />
     </list>
@@ -40,7 +40,7 @@
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "git-widget-placeholder": "productization2",
-    "last_opened_file_path": "D:/work/gitlabcode/idea_smart_park_web",
+    "last_opened_file_path": "D:/work/gitlabcode/idea_smart_park_app",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
@@ -62,6 +62,8 @@
       <workItem from="1722908138026" duration="1694000" />
       <workItem from="1722994693851" duration="23335000" />
       <workItem from="1723165203293" duration="12849000" />
+      <workItem from="1723425923411" duration="85000" />
+      <workItem from="1723429760987" duration="18242000" />
     </task>
     <servers />
   </component>

js_sdk/http.js

@@ -902,7 +902,7 @@ export function meetingRoomDetail(data) {
     )
 }
 
-// 共享资源可用时段查询
+// 获取共享资源可选的时间段
 export function roomTimeSoltUseful(data) {
     return $http.post(
         '/wx/meetingRoom/roomTimeSoltUseful',
@@ -910,10 +910,42 @@ export function roomTimeSoltUseful(data) {
     )
 }
 
-// 共享资源可用时段查询
+// 获取共享资源时间段状态
 export function roomTimeSoltDetail(data) {
     return $http.post(
         '/wx/meetingRoom/roomTimeSoltDetail',
         data, {}
     )
 }
+
+// 共享资源预约
+export function meetingAppoint(data) {
+    return $http.post(
+        '/wx/meetingRoom/meetingAppoint',
+        data, {}
+    )
+}
+
+// 共享资源预约时间段校验
+export function meetingAppointCheck(data) {
+    return $http.post(
+        '/wx/meetingRoom/meetingAppointCheck',
+        data, {}
+    )
+}
+
+// 共享资源预约历史
+export function getMeetingAppointListApp(data) {
+    return $http.post(
+        '/wx/meetingRoom/getMeetingAppointListApp',
+        data, {}
+    )
+}
+
+// 查询用户部门
+export function getUserDept(data) {
+    return $http.post(
+        '/wx/PubController/getUserDept',
+        data, {}
+    )
+}

pages/subPackages/resourceReservation_manage/add.vue

@@ -1,229 +1,430 @@
 <template>
-    <div class="resourceAdd">
-       <div class="topBox">
-         <div class="topTitle">资源预约</div>
-         <div class="choosTimeBox">
-            <span class="msg">使用时间</span>
-            <input placeholder="请选择日期" class="choosIpt" disabled>
-            <input placeholder="请选择时间段" class="choosIpt" disabled>
-         </div>
-       </div>
-      <ul class="predetermineUl">
-        <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="请填写整数">
+  <div class="resourceAdd">
+    <div class="topBox">
+      <div class="topTitle">资源预约</div>
+      <div class="choosTimeBox">
+        <span class="msg">使用时间</span>
+        <span class="choosIpt" @click="showTime('startTime')">{{ startTime }} </span>
+        <span class="choosIpt" @click="showTimeList('startTime')">{{ timeListStr }} </span>
+        <!--            <input placeholder="请选择时间段" class="choosIpt" disabled>-->
+      </div>
+    </div>
+    <ul class="predetermineUl">
+      <li class="detailLi">
+        <span class="liName">主题</span>
+        <span>
+               <input class="liInfo" placeholder="请填写" v-model="form.subject">
           </span>
-        </li>
-        <li class="detailLi">
-          <span class="liName">联系人</span>
-          <span >
-               <input class="liInfo" placeholder="请填写">
+      </li>
+      <li class="detailLi">
+        <span class="liName">容纳人数</span>
+        <span>
+               <input class="liInfo" placeholder="请填写整数" v-model="form.peopleNumber">
           </span>
-        </li>
-        <li class="detailLi">
-          <span class="liName">联系电话</span>
-          <span >
-               <input class="liInfo" placeholder="请填写">
+      </li>
+      <li class="detailLi">
+        <span class="liName">联系人</span>
+        <span>
+               <input class="liInfo" placeholder="请填写" v-model="form.contacts">
           </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">
+      </li>
+      <li class="detailLi">
+        <span class="liName">联系电话</span>
+        <span>
+               <input class="liInfo" placeholder="请填写" v-model="form.phone">
           </span>
-        </li>
-        <li class="detailLi">
-          <span class="liName">容纳人数</span>
-          <span >
-               <input class="liInfo" placeholder="请填写整数">
+      </li>
+      <li class="detailLi2" style="border-bottom: none">
+        <div class="titleBox">
+          <span class="liName">备注</span>
+        </div>
+        <van-field
+            :value="form.remarks"
+            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="form.unit">
           </span>
-        </li>
-        <li class="detailLi">
-          <span class="liName">预约人</span>
-          <span >
-               <input class="liInfo" placeholder="请填写" value="吴凯旋">
+      </li>
+      <li class="detailLi">
+        <span class="liName">预约人</span>
+        <span>
+               <input class="liInfo" placeholder="请填写" v-model="form.appointUserName">
           </span>
-        </li>
-        <li class="detailLi">
-          <span class="liName">预约时间</span>
-          <span >
-               <input class="liInfo" placeholder="请填写" value="YYYYY-MM-DD  HH:MM ">
+      </li>
+      <li class="detailLi">
+        <span class="liName">预约时间</span>
+        <span>
+               <input class="liInfo" placeholder="请填写" v-model="form.appointTime" disabled>
           </span>
-        </li>
-      </ul>
-      <div class="buttonBox">
-        <button class="btn zcBtn">暂存</button>
-        <button class="btn tjBtn">提交</button>
-      </div>
+      </li>
+    </ul>
+    <div class="buttonBox">
+      <button class="btn zcBtn" @click="meetingAppointSubmit('1')">暂存</button>
+      <button class="btn tjBtn" @click="meetingAppointSubmit('2')">提交</button>
     </div>
+    <van-popup
+        :show="timeShow"
+        position="bottom"
+        custom-style="height: 50%;"
+    >
+      <van-datetime-picker
+          type="date"
+          :value="currentDate"
+          :formatter="formatter"
+          @cancel="timeShow=false"
+          @confirm="selectTime"
+      />
+    </van-popup>
+    <van-popup
+        :show="timeListShow"
+        position="bottom"
+        custom-style="height: 50%;"
+    >
+      <van-picker
+          show-toolbar
+          :columns="timeList"
+          value-key="label"
+          @confirm="selectTimeList"
+          @cancel="timeListShow = false"
+      />
+
+    </van-popup>
+  </div>
 </template>
 
 <script>
+import {getByCodes, getUserDept, getUserLocalStorageInfo, meetingAppoint, meetingAppointCheck} from "@/js_sdk/http";
+import dayjs from "dayjs";
+// import Toast from "../../../wxcomponents/weapp/lib/toast/index.vue";
 export default {
   name: "add",
-  data(){
-    return{
-      theme:'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
-      unit:'XXXXXXXXXXXXXX',
-      postData: {}
+  data() {
+    return {
+      dc_key: ['timeSlot'],
+      getUserLocalStorageInfo: getUserLocalStorageInfo(),
+      theme: '',
+      unit: '',
+      postData: {},
+      form: {
+        createdId: getUserLocalStorageInfo().userId,
+        appointTime: dayjs().format('YYYY-MM-DD HH:mm'),
+        userType: getUserLocalStorageInfo().userType
+      },
+      meetingRoomId: '',
+      startTime: '请选择使用时间',
+      timeShow: false,
+      timePickerType: '',
+      currentDate: new Date().getTime(),
+      timeList: [], //  时间段列表
+      timeListStr: '请选择时间段',
+      timeListShow: false,
+      dic_SelectList: [],
     }
+  },
+  created() {
+    this.getByCodes()
+  },
+  onLoad(options) {
+    this.meetingRoomId = options.id
+  },
+  onShow() {
+    // 企业端
+    if (getUserLocalStorageInfo().userType == '1') {
+      this.form.unit = getUserLocalStorageInfo().username
+    }
+    // 管理端
+    if (getUserLocalStorageInfo().userType == '2') {
+      const data = {
+        id: getUserLocalStorageInfo().userId
+      }
+      getUserDept(data).then(res => {
+        this.form.unit = res.msg
+      })
+
+    }
+  },
+  methods: {
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dc_key));
+      this.dic_SelectList = this.$common.handleDicList(data);
+      // this.timeList = this.dic_SelectList.timeSlot.map(item =>{
+      //   return item.label;
+      // });
+      this.timeList = this.dic_SelectList.timeSlot
+
+    },
+    showTime(e) {
+      this.timePickerType = e
+      this.timeShow = true
+    },
+    showTimeList(e) {
+      this.timePickerType = e
+      this.timeListShow = true
+    },
+    // 时间戳转换方法
+    timestampToDate(timestamp) {
+      const date = new Date(timestamp); // 如果timestamp是字符串，确保它是整数：parseInt(timestamp)
+      const year = date.getFullYear();
+      const month = (date.getMonth() + 1).toString().padStart(2, '0');
+      const day = date.getDate().toString().padStart(2, '0');
+      const hours = date.getHours().toString().padStart(2, '0');
+      const minutes = date.getMinutes().toString().padStart(2, '0');
+      const seconds = date.getSeconds().toString().padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
+    // 时间选择单位
+    formatter(type, val) {
+      if (type === 'year') {
+        return `${val}年`;
+      } else if (type === 'month') {
+        return `${val}月`;
+      } else if (type === 'day') {
+        return `${val}日`;
+      } else if (type === 'hour') {
+        return `${val}时`;
+      } else if (type === 'minute') {
+        return `${val}分`;
+      }
+      return val;
+    },
+    selectTime(e) {
+      const dateString = this.timestampToDate(e.detail);
+      this.startTime = dateString
+      this.timeShow = false
+      // this.getRoomTime(this.startTime)
+    },
+    selectTimeList(e) {
+      const data = {
+        id: this.meetingRoomId,
+        dateStr: this.startTime,
+        timeSlot: e.detail.value.value
+      }
+      meetingAppointCheck(data).then((res) => {
+        if (res.code == '200') {
+          this.timeListStr = e.detail.value.label
+          this.form.timeSlot = e.detail.value.value
+          this.timeListShow = false
+        } else {
+          this.$showToast("时间段已占用或已冻结，请重新选择");
+        }
+      }).catch(err => {
+        this.$showToast(err);
+      })
+
+    },
+    // // 获取日期可以选择的区间
+    // getRoomTime(roomTime) {
+    //   const reqData = {
+    //     id: this.roomId,
+    //     useTime: roomTime
+    //   }
+    //   roomTimeSoltUseful(reqData).then((res) => {
+    //     this.timeList = res.data
+    //     console.log('获取日期可以选择的区间_:', res)
+    //   })
+    // },
+
+    // 提交预约
+    meetingAppointSubmit(e) {
+      if (this.startTime !== '' && this.startTime !== null && this.startTime !== undefined &&
+          this.endTime !== '' && this.endTime !== null && this.endTime !== undefined) {
+        uni.showToast({
+          title: "请选择使用时间",
+        });
+        return false
+      }
+      this.form.saveType = e
+      this.form.useTime = this.startTime
+      this.form.meetingRoomId = this.meetingRoomId
+      console.log('提交预约_:', this.form)
+      meetingAppoint(this.form).then((res) => {
+        console.log('提交预约_:', res)
+        if (res.code == '200') {
+          uni.showToast({
+            title: '预约成功',
+            icon: 'success',
+            mask: true,
+            duration: 1000
+          });
+          uni.navigateBack({})
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: 'success',
+            mask: true,
+            duration: 1000
+          });
+        }
+      })
+    },
+
+
   }
 }
 </script>
 
 <style lang="scss">
-    .resourceAdd{
-      .topBox{
-        padding: 24rpx 32rpx;
-        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;
-          }
-        }
+.resourceAdd {
+  .topBox {
+    padding: 24rpx 32rpx;
+    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;
       }
-      .predetermineUl{
-        margin: 24rpx 0;
-        background: white;
+
+      .choosIpt {
+        width: 260rpx;
+        height: 96rpx;
+        padding-left: 50rpx;
+        background: rgba(245, 247, 250, 1);
         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;
-        }
-        .van-cell {
-          background: #F5F7FA !important;
-          border-radius: 8rpx;
-          font-size: 28rpx;
-          margin-top: 16rpx;
-        }
-        .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;
-            }
-          }
+      }
+    }
+  }
+
+  .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;
+    }
+
+    .van-cell {
+      background: #F5F7FA !important;
+      border-radius: 8rpx;
+      font-size: 28rpx;
+      margin-top: 16rpx;
+    }
+
+    .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;
         }
       }
-      .buttonBox{
+    }
+
+    .detailLi2 {
+      display: flex;
+      flex-direction: column;
+      padding: 32rpx 0;
+      border-bottom: 2rpx solid #E6E6E6;
+
+      .detailLi2BoxTop {
         display: flex;
-        justify-content: center;
-        .btn{
-          width: 240rpx;
-          height: 80rpx;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin: 12rpx 0;
+
+        .checkItem {
+          width: 128rpx;
+          height: 64rpx;
+          font-size: 28rpx;
+          color: #666666;
           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;
+          background: #F5F7FA;
+          border-radius: 8rpx;
+          margin: 12rpx 0;
         }
-        .tjBtn{
+
+        .checked {
           background: #0365F9;
+          color: white;
         }
       }
     }
+  }
+
+  .buttonBox {
+    display: flex;
+    justify-content: center;
+
+    .btn {
+      width: 240rpx;
+      height: 80rpx;
+      display: flex;
+      border-radius: 8rpx;
+      align-items: center;
+      justify-content: center;
+      margin: 48rpx 16rpx 150rpx 16rpx;
+      color: white;
+      letter-spacing: 2rpx;
+      text-indent: 2rpx;
+    }
+
+    .zcBtn {
+      background: #FE8643;
+    }
+
+    .tjBtn {
+      background: #0365F9;
+    }
+  }
+}
 </style>

pages/subPackages/resourceReservation_manage/components/shareResources.vue

@@ -11,7 +11,7 @@
     </div>
     <div class="shareListBody">
       <div class="shareItem" v-for="item in meetingList" @tap="toDetail(item)">
-        <img :src="item.url">
+        <img :src="item.url" class="shareItemImg">
         <div class="shareItemRight">
           <span class="shareItemTitle">{{ item.roomName }}</span>
           <span class="shareItemInfo">位置：{{ item.position }}</span>

pages/subPackages/resourceReservation_manage/detail.vue

@@ -31,7 +31,11 @@
       </ul>
       <div class="timeBox">
         <div>日期</div>
-        <div style="margin-left: 110rpx">2024/05/21 — 2024/05/22</div>
+        <div style="margin-left: 110rpx">
+          <span @click="showTime('startTime')">{{startTime}} </span>
+          —
+          <span @click="showTime('endTime')">{{ endTime }} </span>
+        </div>
       </div>
       <div class="bottomTableBody">
         <div class="ModelBox">
@@ -62,7 +66,7 @@
               <div v-for="timeItem in timeList[0].time" class="tableCol" style="background: rgba(245, 247, 250, 1)">{{timeItem.timeInterval}}</div>
             </div>
             <div class="tableRow" v-for="item in timeList">
-              <div v-for="timeItem in item.time" class="tableCol" :class="timeItem.type===1?'ppBg':timeItem.type===2?'orBg':''"></div>
+              <div v-for="timeItem in item.time" class="tableCol" :class="timeItem.type=='2'?'ppBg':timeItem.type=='3'?'orBg':''"></div>
             </div>
           </div>
         </div>
@@ -74,7 +78,7 @@
         custom-style="height: 50%;"
     >
       <van-datetime-picker
-          type="datetime"
+          type="date"
           :value="currentDate"
           :formatter="formatter"
           @cancel="timeShow=false"
@@ -86,6 +90,7 @@
 
 <script>
 import {meetingRoomDetail, getUserLocalStorageInfo, roomTimeSoltDetail} from "@/js_sdk/http";
+import dayjs from "dayjs";
 
 export default {
   name: "detail",
@@ -93,8 +98,8 @@ export default {
     return {
       getUserLocalStorageInfo: getUserLocalStorageInfo(),
       timeList: [
-        {date: '5/21', time: [{timeInterval: '9:00~12:00', type: 1}, {timeInterval: '13:00~18:00', type: 0},]},
-        {date: '5/22', time: [{timeInterval: '9:00~12:00', type: 0}, {timeInterval: '13:00~18:00', type: 2},]},
+        // {date: '5/21', time: [{timeInterval: '9:00~12:00', type: 2}, {timeInterval: '13:00~18:00', type: 0},]},
+        // {date: '5/22', time: [{timeInterval: '9:00~12:00', type: 0}, {timeInterval: '13:00~18:00', type: 3},]},
 
       ],
       form: {
@@ -102,15 +107,25 @@ export default {
         companyName: getUserLocalStorageInfo().username,
       },
       id: '',
+      timePickerType: '',
+      time1Str:'',
+      time2Str:'',
+      regTime1Str:'',
       companyName: getUserLocalStorageInfo().username,
       timeShow:false,
       currentDate: new Date().getTime(),
-
+      startTime: '开始时间',
+      endTime: '结束时间'
     }
   },
   onLoad(options) {
     this.id = options.id
     this.getById()
+    let startTime = dayjs().format('YYYY-MM-DD')
+    let endTime = dayjs().add(6, 'day').format('YYYY-MM-DD')
+    this.startTime = startTime
+    this.endTime = endTime
+    this.roomTimeSoltSeach()
   },
   methods: {
     getById() {
@@ -123,9 +138,25 @@ export default {
         }
       })
     },
+    showTime(e){
+      this.timePickerType = e
+      this.timeShow = true
+    },
+
+    // 时间戳转换方法
+    timestampToDate(timestamp) {
+      const date = new Date(timestamp); // 如果timestamp是字符串，确保它是整数：parseInt(timestamp)
+      const year = date.getFullYear();
+      const month = (date.getMonth() + 1).toString().padStart(2, '0');
+      const day = date.getDate().toString().padStart(2, '0');
+      const hours = date.getHours().toString().padStart(2, '0');
+      const minutes = date.getMinutes().toString().padStart(2, '0');
+      const seconds = date.getSeconds().toString().padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
     roomTimeSoltSeach() {
       if (this.startTime !== '' && this.startTime !== null && this.startTime !== undefined &&
-          this.formatEndTime !== '' && this.formatEndTime !== null && this.formatEndTime !== undefined) {
+          this.endTime !== '' && this.endTime !== null && this.endTime !== undefined) {
         this.roomTimeSolt()
       } else {
         Toast('请选择时间区间')
@@ -135,21 +166,19 @@ export default {
     roomTimeSolt() {
       const reqData = {
         id: this.id,
-        startTime: this.formatStartTime,
-        endTime: this.formatEndTime
+        startTime: this.startTime,
+        endTime: this.endTime
       }
       roomTimeSoltDetail(reqData).then((res) => {
-        this.dateList = []
         this.timeList = []
         if (res.key == 200) {
-          this.dateList = res.data.dateList
-          this.timeList = res.data.timeList
+          this.timeList = res.data
         }
       })
     },
     toAdd() {
       uni.navigateTo({
-        url: '/pages/subPackages/resourceReservation_manage/add'
+        url: '/pages/subPackages/resourceReservation_manage/add?id=' + this.id
       })
     },
     // 时间选择单位
@@ -169,45 +198,33 @@ export default {
     },
     selectTime(e){
       const dateString = this.timestampToDate(e.detail);
-      if(this.timePickerType === 'actStartTime'){
+      if(this.timePickerType === 'startTime'){
         this.time1Str = e.detail
         if (this.time2Str){
-          if (this.time1Str >= this.time2Str){
+          if (this.time1Str > this.time2Str){
             this.$showToast("请选择合理时间");
             return
           }else{
-            this.form.activityStartTime = dateString
+            this.startTime = dateString
           }
         }else{
-          this.form.activityStartTime = dateString
+          this.startTime = dateString
         }
-      }else if(this.timePickerType === 'actEndTime'){
+      }else if(this.timePickerType === 'endTime'){
         this.time2Str = e.detail
         if (this.time1Str){
-          if (this.time1Str >= this.time2Str){
-            this.$showToast("请选择合理时间");
-            return
-          }else{
-            this.form.activityEndTime = dateString
-          }
-        }else{
-          this.form.activityEndTime = dateString
-        }
-      }else if(this.timePickerType === 'regStartTime'){
-        this.regTime1Str = e.detail
-        if (this.time1Str){
-          if (this.time1Str <= this.regTime1Str){
+          if (this.time1Str > this.time2Str){
             this.$showToast("请选择合理时间");
             return
           }else{
-            this.form.registrationStartTime = dateString
+            this.endTime = dateString
           }
         }else{
-          this.form.registrationStartTime = dateString
+          this.endTime = dateString
         }
       }
       this.timeShow = false
-      // console.log(dateString)
+      this.roomTimeSoltSeach()
     },
   }
 }