修改

1、小程序端、PC端，修改文字“淮安市行政中心智慧后勤服务平台”
2、小程序端，进入会议系统后加入弹窗（5秒自动关闭），底部加入会议服务热线
3、小程序端、PC端，加入占用取消功能，管理员专用，取消后即删除

miniprogram/api/meeting/meetingRoom.js

@@ -234,3 +234,11 @@ export function getDep() {
     method: "post",
   })
 }
+
+export function approveOrderDel(data) {
+  return request({
+    url: '/app/mr/delete',
+    method: "post",
+    data,
+  });
+}

miniprogram/pages/index/index.wxml

@@ -8,7 +8,7 @@
         <view class="title"></view>
         <view class="contentView">
             <view class="label1">欢迎进入</view>
-            <view class="label2">市行政中心后勤服务平台</view>
+            <view class="label2">淮安市行政中心智慧后勤服务平台</view>
         </view>
     </view>
     <view class="logo" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/repair/index/logo.png'}});"></view>

miniprogram/pages/meeting/index/index.js

@@ -1,6 +1,7 @@
 const app = getApp()
 
 import Notify from '@vant/weapp/notify/notify';
+import Dialog from '@vant/weapp/dialog/dialog';
 import {
   depLogin
 } from "../../../api/login/login.js"
@@ -67,6 +68,7 @@ Page({
         }
       })
     }, // 弹出层点击确认不关闭，手动关
+    adminTel: '83605343',
   },
   showTimePicker() {
     this.setData({
@@ -82,6 +84,22 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    Dialog.alert({
+      message: '1、此系统分配的账号仅用于会议室申请预约，请各单位专人扎口负责会议预定管理工作。\n2、系统提示“预约提交成功”后请及时关注预约进度，若有疑问请随时拨打会议服务热线：83605343。\n3、会议开始前如需调整会议，请及时通过系统操作或电话告知，已预约成功的会议室可能因临时重大会议取消或调剂，请理解配合。',
+      messageAlign: 'left',
+    }).then(() => {
+      // on close
+    })
+    let count = 5
+    const countdown = setInterval(() => {
+      if (count > 0) {
+        count--;
+      } else {
+        Dialog.close()
+        clearInterval(countdown);
+      }
+    }, 1000)
+
     let _this = this
     let userDetail = wx.getStorageSync('user')
     // 获取两周后时间，默认只能选两周之后，管理员可以选一年后的
@@ -97,7 +115,7 @@ Page({
       key: 'DEP_USERNAME',
       success(res) {
         _this.setData({
-          username:  res.data
+          username: res.data
         })
       },
     })
@@ -105,7 +123,7 @@ Page({
       key: 'DEP_PWD',
       success(res) {
         _this.setData({
-          pwd:  res.data
+          pwd: res.data
         })
       },
     })
@@ -279,6 +297,12 @@ Page({
     })
 
   },
+  callAdmin() {
+    let num = this.data.adminTel
+    wx.makePhoneCall({
+      phoneNumber: num
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

miniprogram/pages/meeting/index/index.wxml

@@ -24,6 +24,11 @@
     </view>
   </view>
 
+  <view style="text-align: center;color: grey; margin-top: 0px;line-height: 20px;">
+      <view bind:tap="callAdmin">
+        会议服务热线： {{ adminTel }}
+      </view>
+    </view>
   <!-- <view class="ownership">{{ownership}}</view> -->
 
 </view>
@@ -35,6 +40,7 @@
   <van-datetime-picker title="请选择会议日期" type="date" value="{{ currentDate }}" min-date="{{ minDate }}" max-date="{{ maxDate }}" formatter="{{ formatter }}" bind:confirm="goRes" bind:cancel="hideTimePicker" />
 </van-popup>
 
+<van-dialog id="van-dialog" />
 <!-- 提示框 -->
 <van-dialog use-slot title="请认证所在单位" show="{{ showLogin }}" show-cancel-button bind:close="onCloseLogin" bind:confirm="orderLogin" beforeClose="{{ beforeClose }}" zIndex="109">
   <van-cell-group style="margin: 20px;">

miniprogram/pages/meeting/reservationRecord/approve/approve.js

@@ -12,7 +12,8 @@ import {
   selectReservationListByUserIdRq,
   selectVisitorInvitationRecordRq,
   cancelOrderRq,
-  approveOrderRq
+  approveOrderRq,
+  approveOrderDel
 } from "../../../../api/meeting/meetingRoom.js"
 
 Page({
@@ -339,7 +340,7 @@ Page({
       if (statusValue == 4) {
         // 占用，可以修改
         showEdit = true
-        // showCancel = true
+        showCancel = true
         // showStaff = true
         statusName = '已占用'
       }
@@ -410,13 +411,54 @@ Page({
   // 取消预约一系列方法
   cancelConfirm(e) {
     console.log('cancelConfirm', e);
+    let status = e.currentTarget.dataset.status
     let _this = this;
     let id = e.currentTarget.dataset.id
-    _this.setData({
-      cancelId: id,
-      showCancelReason: true,
-      cancelReason: ''
-    })
+    if (status == '4') {
+      // 占用，占用的取消直接删除
+      Dialog.confirm({
+        title: '确认',
+        message: '取消后不可撤销，是否确认？',
+      })
+      .then(() => {
+        // on confirm
+        approveOrderDel({
+          id: id,
+        }).then(res => {
+          console.log('delApprove', res)
+          if (res.code == 0) {
+            // 刷新预约数据
+            _this.setData({
+              reservationPageNum: 1,
+              reservationDataList: [],
+              reservationIsDataAll: false,
+              showRejectReason: false
+            })
+            Notify({
+              type: 'success',
+              message: '已取消'
+            })
+            _this.getDataList()
+          } else {
+            // 危险通知
+            Notify({
+              type: 'danger',
+              message: res.msg
+            });
+          }
+        })
+      })
+      .catch(() => {
+        // on cancel
+      });
+    } else {
+      // 其余的取消，需要输入原因
+      _this.setData({
+        cancelId: id,
+        showCancelReason: true,
+        cancelReason: ''
+      })
+    }
   },
   onCloseCancel(e) {
     let _this = this;

miniprogram/pages/meeting/reservationRecord/approve/approve.wxml

@@ -34,7 +34,7 @@
       <!-- <view class="btn" wx:if="{{item.showInvite}}">去邀请
         <button class="shareBtn" open-type="share" data-id="{{item.id}}">转发</button>
       </view> -->
-      <van-button style="margin-right: 10rpx;" size="small" plain type="warning" wx:if="{{item.showCancel}}" bind:tap="cancelConfirm" data-id="{{item.id}}">取消预约</van-button>
+      <van-button style="margin-right: 10rpx;" size="small" plain type="warning" wx:if="{{item.showCancel}}" bind:tap="cancelConfirm" data-id="{{item.id}}" data-status="{{item.status}}">取消预约</van-button>
       <van-button style="margin-right: 10rpx;" size="small" plain type="info" wx:if="{{item.showEdit}}" bind:tap="editConfirm" data-id="{{item.id}}">修改信息</van-button>
       <van-button style="margin-right: 10rpx;" size="small" plain type="warning" wx:if="{{item.showStaff}}" bind:tap="goStaff" data-id="{{item.id}}">会务负责人</van-button>
       <van-button style="margin-right: 10rpx;" size="small" plain type="primary" wx:if="{{item.showApprove}}" bind:tap="pass" data-id="{{item.id}}">通过</van-button>

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js

@@ -14,7 +14,8 @@ import {
   cancelOrderRq,
   inviteRecordPersonListRq,
   getMeetingRoomServiceAndEquipmentRq,
-  approveOrderRq
+  approveOrderRq,
+  approveOrderDel
 } from "../../../../../api/meeting/meetingRoom.js"
 
 Page({
@@ -152,6 +153,7 @@ Page({
         if (act == 'approve') {
           // 管理员允许编辑
           showEdit = true
+          showCancel = true
         }
         statusName = '已占用'
       }
@@ -378,12 +380,53 @@ Page({
   cancelConfirm(e) {
     console.log('cancelConfirm', e);
     let _this = this;
+    let status = e.currentTarget.dataset.status
     let id = e.currentTarget.dataset.id
-    _this.setData({
-      cancelId: id,
-      showCancelReason: true,
-      cancelReason: ''
-    })
+    if (status == '4') {
+      // 占用，占用的取消直接删除
+      Dialog.confirm({
+        title: '确认',
+        message: '取消后不可撤销，是否确认？',
+      })
+      .then(() => {
+        // on confirm
+        approveOrderDel({
+          id: id,
+        }).then(res => {
+          console.log('delApprove', res)
+          if (res.code == 0) {
+            Notify({
+              type: 'success',
+              message: '已取消'
+            })
+            // 数据状态变更，向上个页面传递变更
+            let pages = getCurrentPages(); //获取page
+            let prevPage = pages[pages.length - 2]; //上一个页面（父页面）
+            prevPage.setData({
+              dataChange: true
+            })
+            wx.navigateBack({
+              delta: 1  // 返回的页面数，如果 delta 大于现有页面数，则返回到首页。
+            })
+          } else {
+            // 危险通知
+            Notify({
+              type: 'danger',
+              message: res.msg
+            });
+          }
+        })
+      })
+      .catch(() => {
+        // on cancel
+      });
+    } else {
+      _this.setData({
+        cancelId: id,
+        showCancelReason: true,
+        cancelReason: ''
+      })
+    }
   },
   onCloseCancel(e) {
     let _this = this;

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml

@@ -105,7 +105,7 @@
     <!-- <view class="btn" wx:if="{{detail.showInvite}}">去邀请
             <button class="shareBtn" open-type="share" data-id="{{detail.id}}">转发</button>
         </view> -->
-    <van-button style="margin-right: 10rpx;" size="normal" plain type="warning" wx:if="{{detail.showCancel}}" bind:tap="cancelConfirm" data-id="{{detail.id}}">取消预约</van-button>
+    <van-button style="margin-right: 10rpx;" size="normal" plain type="warning" wx:if="{{detail.showCancel}}" bind:tap="cancelConfirm" data-id="{{detail.id}}" data-status="{{detail.status}}">取消预约</van-button>
     <van-button style="margin-right: 10rpx;" size="normal" plain type="info" wx:if="{{detail.showEdit}}" bind:tap="editConfirm" data-id="{{detail.id}}">修改信息</van-button>
     <van-button style="margin-right: 10rpx;" size="normal" plain type="primary" wx:if="{{detail.showApprove}}" bind:tap="pass" data-id="{{detail.id}}">通过</van-button>
     <van-button style="margin-right: 10rpx;" size="normal" plain type="danger" wx:if="{{detail.showApprove}}" bind:tap="rejectConfirm" data-id="{{detail.id}}">驳回</van-button>