Merge branch 'dev' into release_beta/1.0.0

components/meetingTimePicker/meetingTimePicker.js

@@ -188,10 +188,10 @@ Component({
       const min = endDate.getMinutes();
       endDate.setMinutes(min + 30);
       // 赋值
-      if (this.props.startTime) {
+      if (this.props.startTime && new Date(this.props.startTime).getFullYear()) {
         startDate = new Date(this.props.startTime);
       }
-      if (this.props.endTime) {
+      if (this.props.endTime && new Date(this.props.endTime).getFullYear()) {
         endDate = new Date(this.props.endTime);
       }
 

pages/appDetails/appDetails.axml

@@ -30,7 +30,7 @@
         </view>
     </view>
     <view class="{{isBind ? 'unBinding': 'binding'}} bindBtn {{isLoading ? 'loadingBtn' : ''}}">
-        <text onTap="{{isBind ? 'unbind' : 'bindApp'}}">{{isBind ? '解绑' : '绑定'}}</text>
+        <text onTap="{{isBind ? 'showPopup' : 'bindApp'}}">{{isBind ? '解绑' : '绑定'}}</text>
     </view>
 </view>
 <view class="loadingToast" a:if="{{isLoading}}">

pages/appDetails/appDetails.js

@@ -21,7 +21,6 @@ create.Page({
     selectPopupList: [{ text: "取消关联" }]
   },
   onLoad(e) {
-    console.log(e);
     this.setData({
       platform: e.platform,
       name: e.userName,
@@ -92,7 +91,8 @@ create.Page({
       if (res.data.data) {
         this.setData({
           name: "",
-          isBind: false
+          isBind: false,
+          showSelectPopup: false
         });
         this.$store.data.relatedAppNeedUpdate = "1";
         this.update();

pages/index/index.acss

@@ -388,9 +388,9 @@
 
 .iconicon_days {
     position: absolute;
-    left: 10rpx;
+    left: 9rpx;
     top: 12rpx;
-    font-size: 23rpx;
+    font-size: 24rpx;
 }
 
 .tabBarView .iconicon_days {

pages/meetingRoomList/meetingRoomList.axml

@@ -4,7 +4,7 @@
     <view class="iconfont iconicon_open" onTap="selectSearchTime"></view>
   </view>
 </view>
-<view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}"">
+<view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}">
   <view class="reserveMeeting">
     <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
       <view class="roomMessage">