修改outlook绑定页面

api/request.js

@@ -302,3 +302,11 @@ export function getOutlookUrl(data) {
     url: `https://third-authentication-beta.mingwork.com/microsoft/getThirdLoginUrl?state=${data}`
   });
 }
+// 发送给后端outlook code
+export function authorizationCodeReplacementToken(data) {
+  return $binding({
+    method: "get",
+    data: data,
+    url: `https://third-authentication-beta.mingwork.com/microsoft/authorizationCodeReplacementToken`
+  });
+}

pages/bindingOutlook/bindingOutlook.js

-import { getOutlookUrl } from "../../api/request";
+import {
+  getOutlookUrl,
+  authorizationCodeReplacementToken
+} from "../../api/request";
 Page({
   data: {
     url: ""
   },
   onLoad() {
-    setTimeout(() => {
-      let data = `0968162722860917,${dd.corpId}`;
+    this.webViewContext = dd.createWebViewContext("web-view-1");
+    let data = `${getApp().globalData.userid},${dd.corpId}`;
     getOutlookUrl(data).then(res => {
       this.setData({
         url: res.data.data
       });
-      }, 2000);
     });
   },
   test(e) {
-    dd.alert({
-      content: JSON.stringify(e.detail)
+    const data = {
+      code: code,
+      state: `${getApp().globalData.userid},${dd.corpId}`
+    };
+    authorizationCodeReplacementToken(data).then(res => {
+      console.log(res);
     });
   }
 });

pages/meetingRoomList/meetingRoomList.acss

@@ -128,25 +128,34 @@
 }
 
 .reservation {
-  background: #F3F6FA !important;
-  border: 1px solid rgba(27, 38, 61, 0.10) !important;
+  background: #F3F6FA!important;
+  border: 1px solid rgba(27, 38, 61, 0.1) !important;
 }
 
 .occupied {
-  background: rgba(48, 112, 242, 0.28) !important;
-  border: 1rpx solid rgba(27, 38, 61, 0.10) !important;
+  background: rgba(10, 10, 10, 0.2) !important;
+  border: 1rpx solid rgba(27, 38, 61, 0.1) !important;
+}
+
+.myReservation {
+  background: rgba(234, 12, 40, 1);
+  border: 1rpx solid rgba(27, 38, 61, 0.1);
 }
 
 .reserveRoomTimeBarNum {
   display: flex;
   margin-top: 12rpx;
   font-size: 20rpx;
-  color: #A3A5A8;
+  font-family: DINAlternate-Bold, DINAlternate;
+  font-weight: bold;
+  color: rgba(25, 31, 37, 0.56);
 }
 
 .reserveRoomTimeBarNum>view {
   text-align: center;
+  margin-right: 6rpx;
   flex: 1;
+  width: 24rpx;
 }
 
 /* 弹框的样式 */
@@ -349,7 +358,7 @@
 }
 
 .checked .iconicon_Agreed1 {
-  color: #3296FA;
+  color: rgba(234, 12, 40, 1);
   font-size: 40rpx;
 }
 

pages/meetingRoomList/meetingRoomList.axml

@@ -13,7 +13,7 @@
           {{item.name}}
           </view>
           <view class="reserveRoomEquipFacility" a:if="{{item.equipFacilityNames.length>0}}">
-            <text class="locationIcon iconfont iconicon_app1"></text>
+            <text class="locationIcon iconfont iconicon_facility1"></text>
             <text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text>
           </view>
           <view class="reserveRoomNumAndLocation">

pages/meetingRoomList/meetingRoomList.js

@@ -1215,13 +1215,16 @@ create.Page({
       }:00`;
       this.$store.data.locationName = this.data.meetingTime.meetingRoomName;
       this.$store.data.roomId = this.data.meetingTime.meetingRoomId;
-
     }
-    if ((this.$store.data.locationName != this.$store.data.originalData.location.locationName) || (this.$store.data.roomId != this.$store.data.originalData.meetingRoomId)) {
-      this.$store.data.updateInfo = {
-        updateType: 'modify_location',
+    if (
+      this.$store.data.locationName !=
+        this.$store.data.originalData.location.locationName ||
+      this.$store.data.roomId != this.$store.data.originalData.meetingRoomId
+    ) {
+      (this.$store.data.updateInfo = {
+        updateType: "modify_location",
         isUpate: true
-      },
+      }),
         this.update();
     }
 
@@ -1292,8 +1295,8 @@ create.Page({
       }
     );
   },
-  onMonthChange() { },
-  onYearChange() { },
+  onMonthChange() {},
+  onYearChange() {},
   onSelectHasDisableDate() {
     my.alert({
       content: "SelectHasDisableDate"

pages/place/place.axml

@@ -13,8 +13,7 @@
     </view>
     <block a:for="{{availableMeetingRoom}}">
       <view class="mettingRoom" data-locationName="{{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}}" data-locationid="{{item.meetingRoomId}}" onTap="selectMeetingRoom">
-        <view class="icon iconfont iconicon_room iconhuiyishi2">
-        </view>
+        <!--<view class="icon iconfont iconicon_room iconhuiyishi2"></view> -->
         <view class="mettingRoomRight">
           <view class="name">
             {{item.meetingRoomFullName ? item.meetingRoomFullName : item.name}}
@@ -25,7 +24,7 @@
               <text>{{item.capacityNum}}</text>
             </view>
             <view class="equipment" a:if="{{item.equipFacilityLabelList}}">
-              <text class="iconfont iconshebei iconicon_attender" style="margin-right: 9rpx;"></text>
+              <text class="iconfont iconshebei icon_facility1" style="margin-right: 9rpx;"></text>
               <text a:for="{{item.equipFacilityLabelList}}" a:for-item="equipmentList">{{equipmentList.name}}</text>
             </view>
           </view>