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地址
   }
 });