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,7 +74,7 @@ create.Page({
     userId: "",
     areaMap: null
   },
-  parentStr: '',
+  parentStr: "",
   onLoad(query) {
     let date = new Date(this.$store.data.startTime.replace(/-/g, "/"));
     //  let  date  =  new  Date();
@@ -104,10 +104,10 @@ create.Page({
     getRoomTree().then(res => {
       this.setData({
         areaMap: getFlatTree(res.data.data)
-      })
+      });
       this.getPageData();
       //  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选择会议时间
@@ -1241,11 +1242,15 @@ create.Page({
       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"