12.28

components/handleModule/index.wxml

@@ -22,7 +22,7 @@
         <text class="van-cell-text">{{title}}</text>
     </view>
     <picker class="picker" mode="date" value="{{value}}" data-type="date" start="{{startDate}}" end="{{endDate}}" bindchange="getValue" disabled="{{disabled}}">
-        <text>{{value ?value:placeholder}}</text>
+        <text class="pick-text">{{value ?value:placeholder}}</text>
         <van-icon class="icon" name="arrow" />
     </picker>
 </van-cell>
@@ -33,7 +33,7 @@
         <text class="van-cell-text">{{title}}</text>
     </view>
     <picker class="picker" mode="time" value="{{value}}" data-type="time" bindchange="getValue" disabled="{{disabled}}" start="{{startTime}}" end="{{endTime}}">
-        <text>{{value ?value:placeholder}}</text>
+        <text class="pick-text">{{value ?value:placeholder}}</text>
         <van-icon class="icon" name="arrow" />
     </picker>
 </van-cell>

components/handleModule/index.wxss

@@ -49,4 +49,9 @@
 .have-photo{
     width: 100%;
     height: 100%;
+}
+.pick-text{
+    width: 280rpx;
+    display: inline-block;
+    text-align: right;
 }

components/meetingLayout/index.wxml

@@ -10,7 +10,7 @@
                 <view class="item-top over basics bor1 {{item.monogram?'bgc':''}}" bindtap="getMonogram" data-type="left" data-index="{{index}}" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备桌签')}}">{{item.monogram||'桌签'}}</view>
 
                 <view class="flex">
-                <van-icon name="clear" class="clear-icon" bindtap="cleaeTea" data-index="{{index}}" data-type="left" wx:if="{{item.teaWater}}"/>
+                <van-icon name="clear" class="clear-icon" bindtap="cleaeTea" data-index="{{index}}" data-type="left" wx:if="{{item.teaWater&& !isDisable}}"/>
                     <picker disabled="{{isDisable}}" class="picker" range="{{itemData.meetingBeforeTeaList}}" bindchange="getWater" data-type="left" data-index="{{index}}" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备茶水')}}">
                         <view class="wid item-bottom basics bor1 {{item.teaWater?'bgc':''}}">
                             {{item.teaWater || '茶水'}}
@@ -35,7 +35,7 @@
                 <view class="item-top over basics bor1 {{item.monogram?'bgc':''}}" bindtap="getMonogram" data-type="right" data-index="{{index}}" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备桌签')}}">{{item.monogram||'桌签'}}</view>
 
                 <view class="flex">
-                    <van-icon name="clear" class="clear-icon" bindtap="cleaeTea" data-index="{{index}}" data-type="right" wx:if="{{item.teaWater}}"/>
+                    <van-icon name="clear" class="clear-icon" bindtap="cleaeTea" data-index="{{index}}" data-type="right" wx:if="{{item.teaWater && !isDisable}}"/>
                     <picker disabled="{{isDisable}}" class="picker" range="{{itemData.meetingBeforeTeaList}}" bindchange="getWater" data-type="right" data-index="{{index}}" wx:if="{{utils.indexOf1(itemData.meetingBeforeServiceNameList,'准备茶水')}}">
                         <view class="wid item-bottom basics bor1 {{item.teaWater?'bgc':''}}">{{item.teaWater || '茶水'}}</view>
                     </picker>

pages/home/home.js

@@ -95,9 +95,9 @@ Page({
     //         accountId: this.data.accountList[e.detail.value].id
     //     })
     // },
-    gotomy(){
+    gotomy() {
         wx.switchTab({
-          url: '/pages/mine/index/index',
+            url: '/pages/mine/index/index',
         })
     },
     // 我的会议室-数据
@@ -185,19 +185,23 @@ Page({
                         this.myMeeting()
                     }
                 } else {
-                    wx.removeStorageSync('userInfo')
-                    this.setData({
-                        userInfo: {}
-                    })
+                    this.removeData()
                 }
             }).catch((err) => {
-                wx.removeStorageSync('userInfo')
-                this.setData({
-                    userInfo: {}
-                })
+                this.removeData()
             })
+        } else {
+            this.removeData()
         }
     },
+    removeData() {
+        wx.removeStorageSync('userInfo')
+        this.setData({
+            userInfo: {},
+            myMeetingList: [],
+            meetingList: [],
+        })
+    },
     // 审核人消息订阅
     subscriptionFun() {
         wx.showModal({

pages/login/index.js

@@ -49,6 +49,7 @@ Page({
             })
             return
         }
+        adminId=2
         if (!adminId) {
             wx.showToast({
                 title: '请重新扫码进入',

pages/meeting/appointmentDetail/index.wxml

@@ -14,7 +14,8 @@
 
             <text class="status-text {{item.status==1?'status1':item.status==2?'status2':item.status==3?'status3':''}}" wx:if="{{type=='my-meeting'}}">{{item.status==1?'未开始':item.status==2?'进行中':item.status==3?'已结束':''}}</text>
         </view>
-        <view class="apps-o" bindtap="showFun" wx:if="{{type=='my-meeting' &&item.status!=3}}">更多</view>
+        
+        <view class="apps-o" bindtap="showFun" wx:if="{{type=='my-meeting' && (item.status==1 ||item.status==2&&item.meetingRoomVo.continueMeeting)}}">更多</view>
         <!-- <van-icon name="apps-o" color="#fff" size="50rpx" class="apps-o" bindtap="showFun" wx:if="{{type=='my-meeting' &&item.status!=3}}" /> -->
         <view wx:if="{{type=='my-subscribe' || type=='subscribe-audit'}}">
             <view class="audit" bindtap="gotoFun" data-id="1">
@@ -41,7 +42,7 @@
         <view class="fun-box">
             <!--  三角区域 -->
             <view class="info-panel-triple"></view>
-            <view class="fun-item" wx:for="{{funList}}" wx:key="index" wx:for-item="item1" data-item="{{item1}}" bindtap="clickFun" wx:if="{{utils.indexOf2(item1.status,item1.name,item.status,item.continueMeeting)}}">{{item1.name}}</view>
+            <view class="fun-item" wx:for="{{funList}}" wx:key="index" wx:for-item="item1" data-item="{{item1}}" bindtap="clickFun" wx:if="{{utils.indexOf2(item1.status,item1.name,item.status,item.meetingRoomVo.continueMeeting)}}">{{item1.name}}</view>
         </view>
     </view>
 </view>

pages/meeting/detail/index.js

@@ -111,6 +111,13 @@ Page({
             })
         })
     },
+    preview(event) {
+        let currentUrl = event.currentTarget.dataset.src
+        wx.previewImage({
+            current: currentUrl, // 当前显示图片的http链接
+            urls: [currentUrl] // 需要预览的图片http链接列表
+        })
+    },
     /**
      * 生命周期函数--监听页面加载
      */

pages/meeting/detail/index.wxml

@@ -52,7 +52,7 @@
                 会议室实景图
             </view>
             <view class="picture-box">
-                <image class="picture-img" wx:for="{{itemData.imgList}}" wx:key="index" src="{{item}}" mode="" />
+                <image class="picture-img" wx:for="{{itemData.imgList}}" wx:key="index" src="{{item}}" mode="" bindtap="preview" data-src="{{item}}"/>
             </view>
         </view>
         <view class="contnt-box">

pages/meeting/subscribe/index.js

@@ -158,9 +158,23 @@ Page({
             itemData,
             leftList,
             rightList,
-            type
+            type,
+            timePeriodList
         } = this.data
         let that = this
+        let isType=false
+        timePeriodList.forEach(item=>{
+            if(item.type==1){
+                isType=true
+            }
+        })
+        if(!isType){
+            wx.showToast({
+                title: '当天会议室已经约满',
+                icon: 'none'
+            })
+            return
+        }
         if (!form.appointmentStartTime || !form.appointmentEndTime) {
             wx.showToast({
                 title: '会议时间不能为空',

pages/mine/index/index.js

@@ -77,6 +77,13 @@ Page({
             url
         })
     },
+    preview(event) {
+        let currentUrl = event.currentTarget.dataset.src
+        wx.previewImage({
+            current: currentUrl, // 当前显示图片的http链接
+            urls: [currentUrl] // 需要预览的图片http链接列表
+        })
+    },
     /**
      * 生命周期函数--监听页面加载
      */

pages/mine/index/index.wxml

@@ -11,7 +11,7 @@
                 <view class="head" wx:if="{{ !userInfo}}">
                     <van-icon name="manager" color="#c7cde8" size="130rpx" custom-class="default-head" />
                 </view>
-                <image wx:if="{{userInfo}}" class="head" src="{{userInfo.avatar}}" mode="" />
+                <image wx:if="{{userInfo}}" class="head" src="{{userInfo.avatar}}" mode="" bindtap="preview" data-src="{{userInfo.avatar}}"/>
                 <text class="please m-t">
                     {{userInfo?userInfo.appletUsername:'请先登录'}}
                 </text>