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

api/binding.js

@@ -7,7 +7,7 @@ export default function http(data) {
           "Content-Type": "application/json;charset=UTF-8",
           Authorization: `Bearer ${getApp().globalData.token}`
         },
-        url: `${data.url}`,
+        url: `${getApp().globalData.globalUrl2}${data.url}`,
         method: data.method,
         dataType: "json",
         data: data.data,
@@ -49,7 +49,7 @@ export default function http(data) {
             "Content-Type": "application/json",
             Authorization: `Bearer ${getApp().globalData.token}`
           },
-          url: `${data.url}`,
+          url: `${getApp().globalData.globalUrl}${data.url}`,
           method: data.method,
           data: data.data,
           dataType: "json",

api/request.js

@@ -202,7 +202,7 @@ export function getOutlookUrl(data) {
   return $binding({
     method: "POST",
     data: "",
-    url: `https://third-authentication-beta.mingwork.com/microsoft/getThirdLoginUrl?state=${data}`
+    url: `/microsoft/getThirdLoginUrl?state=${data}`
   });
 }
 // 发送给后端outlook code
@@ -210,7 +210,7 @@ export function authorizationCodeReplacementToken(data) {
   return $binding({
     method: "get",
     data: data,
-    url: `https://third-authentication-beta.mingwork.com/microsoft/authorizationCodeReplacementToken`
+    url: `/microsoft/authorizationCodeReplacementToken`
   });
 }
 // 发送给后端outlook code
@@ -235,7 +235,7 @@ export function getZoomUrl(data) {
   return $binding({
     method: "get",
     data: "",
-    url: "https://third-authentication-beta.mingwork.com/zoom/auth"
+    url: "/zoom/auth"
   });
 }
 
@@ -244,6 +244,6 @@ export function sendZoomCode(data) {
   return $binding({
     method: "get",
     data: data,
-    url: "https://third-authentication-beta.mingwork.com/zoom/notice"
+    url: "/zoom/notice"
   });
 }

app.js

-import { setGlobalStore } from 'dd-store';
-import exampleStore from './stores/exampleStore'
+import { setGlobalStore } from "dd-store";
+import exampleStore from "./stores/exampleStore";
 import { checkFullScren } from "./utils/checkFullScren";
 setGlobalStore(exampleStore);
 
@@ -8,7 +8,7 @@ App({
     // 第一次打开
     // options.query == {number:1}
     // console.info('App onLaunch');
-    this.globalData.isFullScren = checkFullScren
+    this.globalData.isFullScren = checkFullScren;
   },
   onShow(options) {
     // 从后台被 scheme 重新打开
@@ -18,17 +18,14 @@ App({
   globalData: {
     isFullScren: false,
     loading: false,
-    token: '',
-    avatar: '',
-    userid: '',
-    name: '',
-    userInfo: '',
-    // globalUrl: 'https://gateway2.mingwork.com', // 线上地址
-    globalUrl: 'https://gateway-beta.mingwork.com' //beta地址
-    // globalUrl: 'http://192.168.1.111' //beta地址
-    // globalUrl:'http://139.196.213.18:9999' //beta地址
-    // globalUrl: 'http://192.168.1.101:9999', //beta地址
-    // globalUrl:'http://192.168.1.102:9999' //beta地址
-    // 106,112,102
+    token: "",
+    avatar: "",
+    userid: "",
+    name: "",
+    userInfo: "",
+    globalUrl: "https://gateway-beta.mingwork.com", //beta地址
+    globalUrl2: "https://third-authentication-beta.mingwork.com"
+    // globalUrl: "https://gateway2.mingwork.com", // 线上地址
+    // globalUrl2: "https://third-authentication.mingwork.com" //beta地址
   }
 });

pages/meetingRoomList/meetingRoomList.js

@@ -5,7 +5,7 @@ import {
 } from "../../api/request";
 import { EEXIST } from "constants";
 import { getFormatDate, padZero } from "../../utils/utils";
-import { getFlatTree } from '../../utils/flatTree.js'
+import { getFlatTree } from "../../utils/flatTree.js";
 import create from "dd-store";
 create.Page({
   data: {
@@ -74,10 +74,10 @@ create.Page({
     userId: "",
     areaMap: null
   },
-  parentStr: '',
+  parentStr: "",
   onLoad(query) {
     let date = new Date(this.$store.data.startTime.replace(/-/g, "/"));
-    // let date = new Date();
+    //  let  date  =  new  Date();
     let year = date.getFullYear();
     let month = padZero(date.getMonth() + 1);
     let day = padZero(date.getDate());
@@ -104,10 +104,10 @@ create.Page({
     getRoomTree().then(res => {
       this.setData({
         areaMap: getFlatTree(res.data.data)
-      })
+      });
       this.getPageData();
-      // console.log(this.data.areaMap)
-    })
+      //  console.log(this.data.areaMap)
+    });
   },
   onShow() {
     this.update();
@@ -120,8 +120,8 @@ create.Page({
     getReserveRoomList(data).then(res => {
       if (res.data.data) {
         for (let value of res.data.data) {
-          value.name = `${this.getParentStr(value.locationId)}${value.name}`
-          this.parentStr = ''
+          value.name = `${this.getParentStr(value.locationId)}${value.name}`;
+          this.parentStr = "";
         }
         let reserveRoomList = res.data.data.map(item => {
           let startTime = parseInt(
@@ -176,13 +176,14 @@ create.Page({
   },
   // 获取当前id 的祖先
   getParentStr(parentId) {
-    if (parentId !== '0') {
-      this.parentStr = this.data.areaMap.get(parentId).name + '-' + this.parentStr
+    if (parentId !== "0") {
+      this.parentStr =
+        this.data.areaMap.get(parentId).name + "-" + this.parentStr;
       // 此处一定return
-      return this.getParentStr(this.data.areaMap.get(parentId).parentId)
+      return this.getParentStr(this.data.areaMap.get(parentId).parentId);
     } else {
-      let parentStr = this.parentStr
-      return parentStr
+      let parentStr = this.parentStr;
+      return parentStr;
     }
   },
   // 弹出modal选择会议时间
@@ -198,8 +199,8 @@ create.Page({
           ? "0" + modalDate.getHours()
           : modalDate.getHours()
         : modalDate.getHours() + 1 < 10
-          ? "0" + (modalDate.getHours() + 1)
-          : modalDate.getHours() + 1;
+        ? "0" + (modalDate.getHours() + 1)
+        : modalDate.getHours() + 1;
     let num = "";
     if (dateTime.replace(/-/g, "/") === this.data.TimeSlot.todayTime) {
       num = "0";
@@ -283,19 +284,19 @@ create.Page({
           modalFooterTime.getMonth() < 9
             ? "0" + (modalFooterTime.getMonth() + 1)
             : modalFooterTime.getMonth() + 1
-          }-${
+        }-${
           modalFooterTime.getDate() < 10
             ? "0" + modalFooterTime.getDate()
             : modalFooterTime.getDate()
-          } ${
+        } ${
           modalFooterTime.getHours() < 10
             ? "0" + modalFooterTime.getHours()
             : modalFooterTime.getHours()
-          }:${
+        }:${
           modalFooterTime.getMinutes() < 10
             ? "0" + modalFooterTime.getMinutes()
             : modalFooterTime.getMinutes()
-          }`,
+        }`,
         "modalFooter.allMinutes": 30,
         "modalFooter.isOneDay": true
       });
@@ -352,19 +353,19 @@ create.Page({
                   modalFooterTime.getMonth() < 9
                     ? "0" + (modalFooterTime.getMonth() + 1)
                     : modalFooterTime.getMonth() + 1
-                  }-${
+                }-${
                   modalFooterTime.getDate() < 10
                     ? "0" + modalFooterTime.getDate()
                     : modalFooterTime.getDate()
-                  } ${
+                } ${
                   modalFooterTime.getHours() < 10
                     ? "0" + modalFooterTime.getHours()
                     : modalFooterTime.getHours()
-                  }:${
+                }:${
                   modalFooterTime.getMinutes() < 10
                     ? "0" + modalFooterTime.getMinutes()
                     : modalFooterTime.getMinutes()
-                  }`,
+                }`,
                 "modalFooter.allMinutes": allMinutes,
                 "modalFooter.isOneDay": true
               },
@@ -401,19 +402,19 @@ create.Page({
                     modalFooterTime.getMonth() < 9
                       ? "0" + (modalFooterTime.getMonth() + 1)
                       : modalFooterTime.getMonth() + 1
-                    }-${
+                  }-${
                     modalFooterTime.getDate() < 10
                       ? "0" + modalFooterTime.getDate()
                       : modalFooterTime.getDate()
-                    } ${
+                  } ${
                     modalFooterTime.getHours() < 10
                       ? "0" + modalFooterTime.getHours()
                       : modalFooterTime.getHours()
-                    }:${
+                  }:${
                     modalFooterTime.getMinutes() < 10
                       ? "0" + modalFooterTime.getMinutes()
                       : modalFooterTime.getMinutes()
-                    }`,
+                  }`,
                   "modalFooter.allMinutes": allMinutes,
                   "modalFooter.isOneDay": false
                 },
@@ -462,19 +463,19 @@ create.Page({
                   modalFooterTime.getMonth() < 9
                     ? "0" + (modalFooterTime.getMonth() + 1)
                     : modalFooterTime.getMonth() + 1
-                  }-${
+                }-${
                   modalFooterTime.getDate() < 10
                     ? "0" + modalFooterTime.getDate()
                     : modalFooterTime.getDate()
-                  } ${
+                } ${
                   modalFooterTime.getHours() < 10
                     ? "0" + modalFooterTime.getHours()
                     : modalFooterTime.getHours()
-                  }:${
+                }:${
                   modalFooterTime.getMinutes() < 10
                     ? "0" + modalFooterTime.getMinutes()
                     : modalFooterTime.getMinutes()
-                  }`,
+                }`,
                 "modalFooter.allMinutes": allMinutes,
                 "modalFooter.isOneDay": true
               },
@@ -510,19 +511,19 @@ create.Page({
                     modalFooterTime.getMonth() < 9
                       ? "0" + (modalFooterTime.getMonth() + 1)
                       : modalFooterTime.getMonth() + 1
-                    }-${
+                  }-${
                     modalFooterTime.getDate() < 10
                       ? "0" + modalFooterTime.getDate()
                       : modalFooterTime.getDate()
-                    } ${
+                  } ${
                     modalFooterTime.getHours() < 10
                       ? "0" + modalFooterTime.getHours()
                       : modalFooterTime.getHours()
-                    }:${
+                  }:${
                     modalFooterTime.getMinutes() < 10
                       ? "0" + modalFooterTime.getMinutes()
                       : modalFooterTime.getMinutes()
-                    }`,
+                  }`,
                   "modalFooter.allMinutes": allMinutes,
                   "modalFooter.isOneDay": false
                 },
@@ -554,19 +555,19 @@ create.Page({
           startTimeDate.getMonth() + 1 < 10
             ? "0" + (startTimeDate.getMonth() + 1)
             : startTimeDate.getMonth() + 1
-          }-${
+        }-${
           startTimeDate.getDate() < 10
             ? "0" + startTimeDate.getDate()
             : startTimeDate.getDate()
-          } ${
+        } ${
           startTimeDate.getHours() < 10
             ? "0" + startTimeDate.getHours()
             : startTimeDate.getHours()
-          }:${
+        }:${
           startTimeDate.getMinutes() < 10
             ? "0" + startTimeDate.getMinutes()
             : startTimeDate.getMinutes()
-          }`;
+        }`;
         if (meetingStartTime === this.data.meetingTime.endTime) {
           let modalFooterTime = new Date(
             that.data.meetingTime.endTime.replace(/-/g, "/")
@@ -581,19 +582,19 @@ create.Page({
                 modalFooterTime.getMonth() < 9
                   ? "0" + (modalFooterTime.getMonth() + 1)
                   : modalFooterTime.getMonth() + 1
-                }-${
+              }-${
                 modalFooterTime.getDate() < 10
                   ? "0" + modalFooterTime.getDate()
                   : modalFooterTime.getDate()
-                } ${
+              } ${
                 modalFooterTime.getHours() < 10
                   ? "0" + modalFooterTime.getHours()
                   : modalFooterTime.getHours()
-                }:${
+              }:${
                 modalFooterTime.getMinutes() < 10
                   ? "0" + modalFooterTime.getMinutes()
                   : modalFooterTime.getMinutes()
-                }`,
+              }`,
               "modalFooter.allMinutes": 30,
               "modalFooter.isOneDay": true
             },
@@ -618,19 +619,19 @@ create.Page({
                 modalFooterTime.getMonth() < 9
                   ? "0" + (modalFooterTime.getMonth() + 1)
                   : modalFooterTime.getMonth() + 1
-                }-${
+              }-${
                 modalFooterTime.getDate() < 10
                   ? "0" + modalFooterTime.getDate()
                   : modalFooterTime.getDate()
-                } ${
+              } ${
                 modalFooterTime.getHours() < 10
                   ? "0" + modalFooterTime.getHours()
                   : modalFooterTime.getHours()
-                }:${
+              }:${
                 modalFooterTime.getMinutes() < 10
                   ? "0" + modalFooterTime.getMinutes()
                   : modalFooterTime.getMinutes()
-                }`,
+              }`,
               "modalFooter.allMinutes": allMinutes
             },
             () => {
@@ -649,19 +650,19 @@ create.Page({
           endTimeDate.getMonth() + 1 < 10
             ? "0" + (endTimeDate.getMonth() + 1)
             : endTimeDate.getMonth() + 1
-          }-${
+        }-${
           endTimeDate.getDate() < 10
             ? "0" + endTimeDate.getDate()
             : endTimeDate.getDate()
-          } ${
+        } ${
           endTimeDate.getHours() < 10
             ? "0" + endTimeDate.getHours()
             : endTimeDate.getHours()
-          }:${
+        }:${
           endTimeDate.getMinutes() < 10
             ? "0" + endTimeDate.getMinutes()
             : endTimeDate.getMinutes()
-          }`;
+        }`;
         if (meetingEndTime === this.data.meetingTime.startTime) {
           let modalFooterTime = new Date(
             this.data.meetingTime.startTime.replace(/-/g, "/")
@@ -675,19 +676,19 @@ create.Page({
                 modalFooterTime.getMonth() < 9
                   ? "0" + (modalFooterTime.getMonth() + 1)
                   : modalFooterTime.getMonth() + 1
-                }-${
+              }-${
                 modalFooterTime.getDate() < 10
                   ? "0" + modalFooterTime.getDate()
                   : modalFooterTime.getDate()
-                } ${
+              } ${
                 modalFooterTime.getHours() < 10
                   ? "0" + modalFooterTime.getHours()
                   : modalFooterTime.getHours()
-                }:${
+              }:${
                 modalFooterTime.getMinutes() < 10
                   ? "0" + modalFooterTime.getMinutes()
                   : modalFooterTime.getMinutes()
-                }`,
+              }`,
               "modalFooter.allMinutes": 30
             },
             () => {
@@ -711,19 +712,19 @@ create.Page({
                 modalFooterTime.getMonth() < 9
                   ? "0" + (modalFooterTime.getMonth() + 1)
                   : modalFooterTime.getMonth() + 1
-                }-${
+              }-${
                 modalFooterTime.getDate() < 10
                   ? "0" + modalFooterTime.getDate()
                   : modalFooterTime.getDate()
-                } ${
+              } ${
                 modalFooterTime.getHours() < 10
                   ? "0" + modalFooterTime.getHours()
                   : modalFooterTime.getHours()
-                }:${
+              }:${
                 modalFooterTime.getMinutes() < 10
                   ? "0" + modalFooterTime.getMinutes()
                   : modalFooterTime.getMinutes()
-                }`,
+              }`,
               "modalFooter.allMinutes": allMinutes
             },
             () => {
@@ -762,19 +763,19 @@ create.Page({
                   modalFooterTime.getMonth() < 9
                     ? "0" + (modalFooterTime.getMonth() + 1)
                     : modalFooterTime.getMonth() + 1
-                  }-${
+                }-${
                   modalFooterTime.getDate() < 10
                     ? "0" + modalFooterTime.getDate()
                     : modalFooterTime.getDate()
-                  } ${
+                } ${
                   modalFooterTime.getHours() < 10
                     ? "0" + modalFooterTime.getHours()
                     : modalFooterTime.getHours()
-                  }:${
+                }:${
                   modalFooterTime.getMinutes() < 10
                     ? "0" + modalFooterTime.getMinutes()
                     : modalFooterTime.getMinutes()
-                  }`,
+                }`,
                 "modalFooter.allMinutes": allMinutes,
                 "modalFooter.isOneDay": true
               },
@@ -808,19 +809,19 @@ create.Page({
                     modalFooterTime.getMonth() < 9
                       ? "0" + (modalFooterTime.getMonth() + 1)
                       : modalFooterTime.getMonth() + 1
-                    }-${
+                  }-${
                     modalFooterTime.getDate() < 10
                       ? "0" + modalFooterTime.getDate()
                       : modalFooterTime.getDate()
-                    } ${
+                  } ${
                     modalFooterTime.getHours() < 10
                       ? "0" + modalFooterTime.getHours()
                       : modalFooterTime.getHours()
-                    }:${
+                  }:${
                     modalFooterTime.getMinutes() < 10
                       ? "0" + modalFooterTime.getMinutes()
                       : modalFooterTime.getMinutes()
-                    }`,
+                  }`,
                   "modalFooter.allMinutes": allMinutes,
                   "modalFooter.isOneDay": false
                 },
@@ -871,19 +872,19 @@ create.Page({
                   modalFooterTime2.getMonth() < 9
                     ? "0" + (modalFooterTime2.getMonth() + 1)
                     : modalFooterTime2.getMonth() + 1
-                  }-${
+                }-${
                   modalFooterTime2.getDate() < 10
                     ? "0" + modalFooterTime2.getDate()
                     : modalFooterTime2.getDate()
-                  } ${
+                } ${
                   modalFooterTime2.getHours() < 10
                     ? "0" + modalFooterTime2.getHours()
                     : modalFooterTime2.getHours()
-                  }:${
+                }:${
                   modalFooterTime2.getMinutes() < 10
                     ? "0" + modalFooterTime2.getMinutes()
                     : modalFooterTime2.getMinutes()
-                  }`,
+                }`,
                 "modalFooter.allMinutes": allMinutes,
                 "modalFooter.isOneDay": true
               },
@@ -917,19 +918,19 @@ create.Page({
                     modalFooterTime.getMonth() < 9
                       ? "0" + (modalFooterTime.getMonth() + 1)
                       : modalFooterTime.getMonth() + 1
-                    }-${
+                  }-${
                     modalFooterTime.getDate() < 10
                       ? "0" + modalFooterTime.getDate()
                       : modalFooterTime.getDate()
-                    } ${
+                  } ${
                     modalFooterTime.getHours() < 10
                       ? "0" + modalFooterTime.getHours()
                       : modalFooterTime.getHours()
-                    }:${
+                  }:${
                     modalFooterTime.getMinutes() < 10
                       ? "0" + modalFooterTime.getMinutes()
                       : modalFooterTime.getMinutes()
-                    }`,
+                  }`,
                   "modalFooter.allMinutes": allMinutes,
                   "modalFooter.isOneDay": false
                 },
@@ -958,19 +959,19 @@ create.Page({
         endTimeDate.getMonth() + 1 < 10
           ? "0" + (endTimeDate.getMonth() + 1)
           : endTimeDate.getMonth() + 1
-        }-${
+      }-${
         endTimeDate.getDate() < 10
           ? "0" + endTimeDate.getDate()
           : endTimeDate.getDate()
-        } ${
+      } ${
         endTimeDate.getHours() < 10
           ? "0" + endTimeDate.getHours()
           : endTimeDate.getHours()
-        }:${
+      }:${
         endTimeDate.getMinutes() < 10
           ? "0" + endTimeDate.getMinutes()
           : endTimeDate.getMinutes()
-        }:00`
+      }:00`
     };
     return getAllScheduleWithMeetingRoomByTime(data).then(res => {
       return res.data.data;
@@ -1064,8 +1065,8 @@ create.Page({
             e.currentTarget.dataset.num == "0"
               ? this.data.TimeSlot.todayTime
               : e.currentTarget.dataset.num == "1"
-                ? this.data.TimeSlot.tomorrowTime
-                : this.data.TimeSlot.afterTomorrowTime,
+              ? this.data.TimeSlot.tomorrowTime
+              : this.data.TimeSlot.afterTomorrowTime,
           dataNum: e.currentTarget.dataset.num
         },
         () => {
@@ -1084,18 +1085,18 @@ create.Page({
           ? "0" + modalDate.getHours()
           : modalDate.getHours()
         : modalDate.getHours() + 1 < 10
-          ? "0" + (modalDate.getHours() + 1)
-          : modalDate.getHours() + 1;
+        ? "0" + (modalDate.getHours() + 1)
+        : modalDate.getHours() + 1;
     let selectDate = new Date(this.data.meetingTime.date);
     let meetingDate = `${selectDate.getFullYear()}-${
       selectDate.getMonth() + 1 < 10
         ? "0" + (selectDate.getMonth() + 1)
         : selectDate.getMonth() + 1
-      }-${
+    }-${
       selectDate.getDate() < 10
         ? "0" + selectDate.getDate()
         : selectDate.getDate()
-      }`;
+    }`;
     let data = {
       meetingRoomId: that.data.meetingTime.meetingRoomId,
       startTime: meetingDate
@@ -1198,19 +1199,19 @@ create.Page({
         endTimeDate.getMonth() + 1 < 10
           ? "0" + (endTimeDate.getMonth() + 1)
           : endTimeDate.getMonth() + 1
-        }/${
+      }/${
         endTimeDate.getDate() < 10
           ? "0" + endTimeDate.getDate()
           : endTimeDate.getDate()
-        } ${
+      } ${
         endTimeDate.getHours() < 10
           ? "0" + endTimeDate.getHours()
           : endTimeDate.getHours()
-        }:${
+      }:${
         endTimeDate.getMinutes() < 10
           ? "0" + endTimeDate.getMinutes()
           : endTimeDate.getMinutes()
-        }:00`;
+      }:00`;
       this.$store.data.locationName = this.data.meetingTime.meetingRoomName;
       this.$store.data.roomId = this.data.meetingTime.meetingRoomId;
       this.update();
@@ -1224,28 +1225,32 @@ create.Page({
         endTimeDate.getMonth() + 1 < 10
           ? "0" + (endTimeDate.getMonth() + 1)
           : endTimeDate.getMonth() + 1
-        }/${
+      }/${
         endTimeDate.getDate() < 10
           ? "0" + endTimeDate.getDate()
           : endTimeDate.getDate()
-        } ${
+      } ${
         endTimeDate.getHours() < 10
           ? "0" + endTimeDate.getHours()
           : endTimeDate.getHours()
-        }:${
+      }:${
         endTimeDate.getMinutes() < 10
           ? "0" + endTimeDate.getMinutes()
           : endTimeDate.getMinutes()
-        }:00`;
+      }:00`;
       this.$store.data.locationName = this.data.meetingTime.meetingRoomName;
       this.$store.data.roomId = this.data.meetingTime.meetingRoomId;
     }
     if (this.$store.data.originalData && this.$store.data.locationName) {
-      if ((this.$store.data.locationName != this.$store.data.originalData.location.locationName) || this.$store.data.roomId != this.$store.data.originalData.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",
           isUpate: true
-        }
+        };
         this.update();
       }
     }
@@ -1316,8 +1321,8 @@ create.Page({
       }
     );
   },
-  onMonthChange() { },
-  onYearChange() { },
+  onMonthChange() {},
+  onYearChange() {},
   onSelectHasDisableDate() {
     my.alert({
       content: "SelectHasDisableDate"