修改冲突

pages/createOrEditSchedule/createOrEditSchedule.axml

@@ -46,7 +46,7 @@
 <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
   <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
   </view>
-  <view class="place" a:if="{{!!locationName}}">
+  <view class="place" a:if="{{!!scheduleItem?!!locationName:true}}">
     <view class="icon iconfont icondingwei">
     </view>
     <view class="text" data-nextPage="place" onTap="nextPage">
@@ -154,7 +154,7 @@
 </view>
 <!-- 编辑列表 -->
 <view class="editList">
-  <view a:if="{{!!scheduleItem?organizer==permissions&&!locationName:!locationName}}" class="listGroup" onTap="editSchedule" data-icon="icondingwei">
+  <view a:if="{{!!scheduleItem?organizer==permissions&&!locationName:false}}" class="listGroup" onTap="editSchedule" data-icon="icondingwei">
     <view class="listIcon iconfont icondingwei">
     </view>
     <view class="listText">

pages/index/index.axml

 <!-- <mw-select></mw-select> -->
-版本号：105版
+版本号：106版
 <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" style="height: 100vh;" scroll-into-view="{{todayStr}}">
     <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
         <block a:for="{{scheduleYearList}}">

pages/repeatMechanism/repeatMechanism.js

@@ -9,7 +9,7 @@ create.Page({
     repeatList: [
       { model: 'no_repeat', text: '不重复', weekDayList: [] },
       { model: 'every_day', text: '每天重复', weekDayList: [] },
-      { model: 'day_in_week', text: '每周重复', weekDayList: [] },
+      { model: 'day_in_week', text: '', weekDayList: [] },
       { model: 'day_in_week', text: '每周的工作日重复', weekDayList: ['MO', 'TU', 'WE', 'TH', 'FR'] }
     ]
   },

pages/scheduleDetail/scheduleDetail.axml

@@ -112,11 +112,11 @@
             </view>
             <view class="triangle"></view>
           </view>
-          <view class="selectDynamicright">
+          <view class="selectDynamicright" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
           </view>
         </view>
       </view>
-      <view class="otherTip">
+      <view class="otherTip" a:if="{{!!item.content}}">
             {{item.content}}
             {{item.time}}
       </view>