Merge branch 'dev' of http://gitlab.roboming.com/fengzhaoyu/schedule into dev

PageComponents/myDynamic/myDynamic.acss

+@import "../../template/affairBlank/index.acss";
 .dynamicBox {
     height: 100vh;
     width: 100%;
@@ -148,37 +149,6 @@
     width: 100%;
     height: 100%;
     display: flex;
-    align-items: center;
     justify-content: center;
-}
-
-.noDate>view {
-    display: flex;
-    flex-direction: column;
     align-items: center;
-    margin-top: -116rpx;
-}
-
-.noDate image {
-    width: 280rpx;
-    height: 290rpx;
-    display: block;
-}
-
-.noDateTitle {
-    margin: 56rpx 0 24rpx 0;
-    font-size: 32rpx;
-    color: #191F25;
-    letter-spacing: 0;
-    text-align: center;
-    line-height: 32rpx;
-}
-
-.noDateTip {
-    font-size: 28rpx;
-    width: 524rpx;
-    color: rgba(25, 31, 37, 0.40);
-    letter-spacing: 0;
-    text-align: center;
-    line-height: 1.5;
 }
\ No newline at end of file

PageComponents/myDynamic/myDynamic.axml

+<import src="../../template/affairBlank/index.axml"/>
 <scroll-view a:if="{{dynamicList.length !== 0}}" scroll-y="{{true}}" class="dynamicBox" onScrollToLower="onScrollToLower">
   <view class="dynamicList">
     <swipe rightWidth="{{ 78 }}" leftWidth="{{ 0 }}" a:for="{{dynamicList}}" class="dynamicContent">
@@ -30,13 +31,5 @@
   </view>
 </scroll-view>
 <view class="noDate" a:else>
-  <view>
-    <image mode="widthFix" src="../../assests/noDynamic.png"/>
-    <view class="noDateTitle">
-      展示安排的所有动态
-    </view>
-    <view class="noDateTip">
-      实时同步所有事件的最新动态，便于随时处理工作内容
-    </view>
-  </view>
+  <template is="affair-placeholder" data="{{title: '展示安排的所有动态', tip: '实时同步所有事件的最新动态，便于随时处理工作内容'}}"/>
 </view>
\ No newline at end of file

components/meetingTimePicker/meetingTimePicker.acss

@@ -35,6 +35,7 @@ picker-view .column {
     border-radius: 8rpx;
     margin-right: 24rpx;
     box-sizing: border-box;
+    border: 2rpx solid transparent;
 }
 
 .tab>view>text {

components/swipe/swipe.js

@@ -37,6 +37,7 @@ Component({
   },
   methods: {
     close: function () {
+      this.dragging = false;
       this.swipeMove(0);
     },
     destroyed: function () {

pages/meetingDetail/meetingDetail.acss

+@import "../../template/affairBlank/index.acss";
 page {
     background: rgba(232, 237, 240, 1);
 }
@@ -514,34 +515,18 @@ input {
 
 .affair-placeholder {
     border-top: 1px solid rgba(239, 242, 245, 1);
-    padding: 168rpx 72rpx 0 72rpx;
+    padding-top: 168rpx;
     text-align: center;
 }
 
 .affair-placeholder image {
-    width: 280rpx;
+    margin-top: 50rpx;
 }
 
-.affair-placeholder .affair-placeholder-text {
-    color: rgba(10, 10, 10, 0.4);
-    text-align: center;
-    padding: 96rpx 0 56rpx 0;
-    font-size: 28rpx;
+.affair-placeholder .affair-blank-tip {
     white-space: nowrap;
 }
 
-.affair-placeholder .affair-placeholder-button {
-    color: #fff;
-    border-radius: 48rpx;
-    padding: 0 38rpx;
-    height: 72rpx;
-    line-height: 72rpx;
-    font-size: 30rpx;
-    text-align: center;
-    background: rgb(234, 12, 40);
-    display: inline-block;
-}
-
 .metingDetail {
     overflow: hidden;
     height: 100vh;

pages/meetingDetail/meetingDetail.axml

@@ -190,6 +190,7 @@
     <selectpopup showSelectPopup="{{conSelectPopupData.showSelectPopup}}" selectPopupList="{{conSelectPopupData.selectType==='noParticipateStatus' ? conSelectPopupData.noParticipateStatusList : conSelectPopupData.selectType==='delSheudle' ? conSelectPopupData.delSheudleList : (conSelectPopupData.selectType === 'participateStatus' ? conSelectPopupData.participateStatusList : conSelectPopupData.editSaveList)}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup>
     <!-- 动态列表 -->
     <import src="../../template/avater/index.axml"/>
+    <import src="../../template/affairBlank/index.axml"/>
     <view class="affair-list" onTap="hideFileOperate">
       <view class="affair-list-title">会议动态</view>
       <block a:for="{{affairList}}">
@@ -214,12 +215,8 @@
         <view a:if="{{item.content}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
       </block>
       <view class="affair-placeholder" a:if="{{affairList.length <= 1}}">
-        <image mode="widthFix" src="../../assests/noDynamic.png"/>
-        <view class="affair-placeholder-text">我们不开无准备的会，快来上传会议文件吧。</view>
-        <view onTap="addMeetingFile" class="affair-placeholder-button">添加会议文件</view>
+        <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
       </view>
-      <!--<view class="delMetting" onTap="delSheudle"><view class=" iconfont iconicon_close"></view><view>
-          删除该会议</view></view> -->
       <popup title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">
         <meeting-time-picker a:if="{{'time' === comType}}" onComplete="onComplete" startTime="{{$data.startTime}}" endTime="{{$data.endTime}}"></meeting-time-picker>
         <hlist a:if="{{'participator' === comType}}" dataComList="{{comHListData.contactData}}" onSelectComHList="selectComHList"></hlist>

template/affairBlank/index.acss

+.affair-blank {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    padding: 0 72rpx;
+    text-align: center;
+    margin-top: -96rpx;
+}
+
+.affair-blank image {
+    width: 280rpx;
+    display: block;
+}
+
+.affair-blank-title {
+    margin: 56rpx 0 24rpx 0;
+    font-size: 32rpx;
+    color: #191F25;
+}
+
+.affair-blank-tip {
+    font-size: 28rpx;
+    color: rgba(25, 31, 37, 0.40);
+    line-height: 1.5;
+    padding: 0 20rpx;
+}
\ No newline at end of file

template/affairBlank/index.axml

+<template name='affair-placeholder'>
+    <view class="affair-blank">
+        <image mode="widthFix" src="../../assests/noDynamic.png"/>
+        <view class="affair-blank-title">
+      {{title}}
+        </view>
+        <view class="affair-blank-tip">
+       {{tip}}
+        </view>
+    </view>
+</template>
\ No newline at end of file