Skip to content

S
schedule
Commit 7be433ca by xiexiaoqin
Options

Merge branch 'release/dev/2.0.0' into release/2.0.0

parents 97502126 97ce0858
Showing with 6 additions and 10 deletions
pages/createMeeting/createMeeting.axml
......@@ -36,12 +36,10 @@
<view class="timeText" catchTap="handleTime">
{{showTime}}
</view>
<view class="repeatModal" a:if="{{repeat.repeatable !== 0}}" catchTap="handleRepeatModal">
{{repeat.repeatList[repeat.selectRepeatId].text}}重复
</view>
</view>
<view class="icon iconfont iconicon_repeat1 " catchTap="handleRepeatModal" a:if="{{repeat.repeatable == 0}}">
<!--<view class="repeatModal" a:if="{{repeat.repeatable !== 0}}" catchTap="handleRepeatModal">
{{repeat.repeatList[repeat.selectRepeatId].text}}重复</view> -->
</view>
<!--<view class="icon iconfont iconicon_repeat1 " catchTap="handleRepeatModal" a:if="{{repeat.repeatable == 0}}"></view> -->
</view>
</view>
<!-- participatorList participatorUserId 参会人 -->
......
pages/meetingDetail/meetingDetail.axml
......@@ -59,12 +59,10 @@
<view class="timeText" catchTap="handleTime" data-type='time'>
{{showTime}}
</view>
<view class="repeatModal" a:if="{{repeat.repeatable !== 0}}" catchTap="handleRepeatModal">
{{repeat.repeatList[repeat.selectRepeatId].text}}重复
</view>
</view>
<view class="icon iconfont iconicon_repeat1" catchTap="handleRepeatModal" a:if="{{repeat.repeatable == 0}}">
<!--<view class="repeatModal" a:if="{{repeat.repeatable !== 0}}" catchTap="handleRepeatModal">
{{repeat.repeatList[repeat.selectRepeatId].text}}重复</view> -->
</view>
<!--<view class="icon iconfont iconicon_repeat1" catchTap="handleRepeatModal" a:if="{{repeat.repeatable == 0}}"></view> -->
</view>
</view>
<view class="permission" a:if="{{currentPeople != organizer}}">
......
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