Commit c183fe36 by liang ce

修改utils方法,更改可用会议室图标

parent cb85460e
...@@ -40,6 +40,7 @@ Page({ ...@@ -40,6 +40,7 @@ Page({
const today = new Date() const today = new Date()
const finalDate = new Date(today) const finalDate = new Date(today)
finalDate.setDate(today.getDate() - today.getDay()) finalDate.setDate(today.getDate() - today.getDay())
console.log(finalDate.toLocaleDateString())
that.setData({ that.setData({
scheduleList: scheduleList, scheduleList: scheduleList,
todayStr: finalDate.toLocaleDateString(), todayStr: finalDate.toLocaleDateString(),
...@@ -249,7 +250,7 @@ Page({ ...@@ -249,7 +250,7 @@ Page({
dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?scheduleItem=${JSON.stringify(item)}` }) dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?scheduleItem=${JSON.stringify(item)}` })
}, 1000), }, 1000),
nextPage: throttle(function (e) { nextPage: throttle(function (e) {
dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' }) dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
}, 1000), }, 1000),
lower() { lower() {
let year = this.data.maxYear + 1 let year = this.data.maxYear + 1
......
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
</view> </view>
<view class="reserveRoomNumAndLocation"> <view class="reserveRoomNumAndLocation">
<view class="reserveRoomNum"> <view class="reserveRoomNum">
<text class="locationIcon iconfont icondingwei1"></text>{{item.capacityNum}} <text class="locationIcon iconfont iconcanhuiren"></text>{{item.capacityNum}}
</view> </view>
<view class="reserveRoomLocation"> <view class="reserveRoomLocation">
<text class="locationIcon iconfont iconcanhuiren"></text>{{item.locationName}} <text class="locationIcon iconfont icondingwei1"></text>{{item.locationName}}
</view> </view>
</view> </view>
</view> </view>
......
...@@ -21,10 +21,11 @@ ...@@ -21,10 +21,11 @@
</view> </view>
<view class="mettingRoomDetail"> <view class="mettingRoomDetail">
<view class="num"> <view class="num">
<text class="numIcon iconfont iconbeifangren"></text> <text class="numIcon iconfont iconcanhuiren"></text>
<text>{{item.capacityNum}}</text> <text>{{item.capacityNum}}</text>
</view> </view>
<view class="equipment"> <view class="equipment" a:if="{{item.equipFacilityLabelList}}">
<text class="numIcon iconfont icondingwei1"></text>
<text a:for="{{item.equipFacilityLabelList}}" a:for-item="equipmentList">{{equipmentList.name}}</text> <text a:for="{{item.equipFacilityLabelList}}" a:for-item="equipmentList">{{equipmentList.name}}</text>
</view> </view>
</view> </view>
......
...@@ -6,9 +6,9 @@ export function throttle(fn, gapTime) { ...@@ -6,9 +6,9 @@ export function throttle(fn, gapTime) {
let _lastTime = null let _lastTime = null
return function () { return function () {
let _nowTime = + new Date() let _nowTime = new Date()
if (_nowTime - _lastTime > gapTime || !_lastTime) { if (_nowTime - _lastTime > gapTime || !_lastTime) {
fn() fn.apply(this, arguments) //将this和参数传给原函数
_lastTime = _nowTime _lastTime = _nowTime
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment