merge

pages/appDetails/appDetails.axml

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

pages/index/index.acss

@@ -191,8 +191,9 @@
     margin-bottom: 32rpx;
 }
 
-.today {
+.date .today {
     border-left: 8rpx solid rgba(234, 12, 40, 1);
+    color: rgba(10, 10, 10, 1) !important;
 }
 
 .todayNoData {
@@ -388,9 +389,9 @@
 
 .iconicon_days {
     position: absolute;
-    left: 10rpx;
+    left: 9rpx;
     top: 12rpx;
-    font-size: 23rpx;
+    font-size: 24rpx;
 }
 
 .tabBarView .iconicon_days {

pages/index/index.axml

@@ -79,7 +79,7 @@
           <!-- 天 -->
           <block a:elif="{{item.type == 'day' || item.type == 'today'}}">
             <view class="date li" id="{{ item.dateStr}}">
-              <view class="hasDateTitle {{item.type == 'today' && item.hasDateLabel ? 'today' : ''}} {{item.value.isBeOverdue ? 'overdueLabel':''}}">
+              <view class="hasDateTitle  {{item.value.isBeOverdue ? 'overdueLabel':''}} {{item.type == 'today' && item.hasDateLabel ? 'today' : ''}}">
                 <view>
                 {{item.week}}
                 </view>

pages/meetingDetail/meetingDetail.acss

@@ -117,7 +117,7 @@ page {
 }
 
 .hideTitle {
-    font-family: PingFangSC-Medium;
+    font-family: PingFangSC-Regular;
     font-size: 40rpx;
     line-height: 56rpx;
     color: #1B263D;

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">

pages/unbindApp/unbindApp.js

@@ -30,7 +30,7 @@ create.Page({
   unbind() {
     unbindingApp(this.data.item.platform).then(res => {
       if (res.data.data) {
-        this.$store.data.relatedAppNeedUpdate = "1";
+        this.$store.data.relatedAppNeedUpdate = true;
         this.update();
         dd.navigateBack({
           delta: 1

yarn.lock

@@ -7,11 +7,23 @@ dd-store@^1.9.0:
   resolved "https://registry.yarnpkg.com/dd-store/-/dd-store-1.9.0.tgz#8f531e28b6991919bc60a17148fa9e1bba142397"
   integrity sha512-bhIkQMcHjNTDGG03riSeLp4UfdOBqWqg+qFfqqwAvgBiARrYbrEWU/YVE5tOV6XOqyfozp+MpZP3SaFyOtuUrw==
 
+dingtalk-jsapi@^2.10.3:
+  version "2.10.3"
+  resolved "https://registry.yarnpkg.com/dingtalk-jsapi/-/dingtalk-jsapi-2.10.3.tgz#ade5c2f858f4ac41143d294ae172b34efaeb95e2"
+  integrity sha512-ozfuwWzOKx4qgfs+ijdN2XgylB8xZ4zxetDp4ND272YDD5C9GJLo5GKhsFR6kQ/lnU0WIzBo2rYjEwZKtMrJxw==
+  dependencies:
+    promise-polyfill "^7.1.0"
+
 luxon@^1.21.3:
   version "1.22.2"
   resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.22.2.tgz#799d65cc1ed0ba85b4cb3f7dd38fc08a8d1a6750"
   integrity sha512-vq6eSaOOw1fKob+JXwfu0e3/UFUT4G4HTFRJab7dch8J1OdOGW/vXqCiJsY7rm2In+5gKNYx0EtnYT0Tc5V4Qw==
 
+promise-polyfill@^7.1.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz#ab05301d8c28536301622d69227632269a70ca3b"
+  integrity sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==
+
 rrule@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/rrule/-/rrule-2.6.4.tgz#7f4f31fda12bc7249bb176c891109a9bc448e035"