Merge branch 'dev' into release_beta/1.0.0

api/request.js

@@ -142,7 +142,7 @@ export function isParticipate(data) {
 export function getMeetingRoomRepeatAffairs(groupId, page) {
   return $http({
     method: "get",
-    url: `/meet/meeting-log/scheduleTemplateMeetingLogPage?category=2,3&groupId=${groupId}&size=10&current=${page}`
+    url: `/meet/meeting-log/scheduleTemplateMeetingLogPage?groupId=${groupId}&size=10&current=${page}`
   });
 }
 //会议室详情的获取动态列表

app.js

@@ -2,6 +2,7 @@ import { setGlobalStore } from "dd-store";
 import exampleStore from "./stores/exampleStore";
 setGlobalStore(exampleStore);
 import login from "./api/login";
+import { globalUrl, globalUrl2 } from './config';
 
 App({
   onLaunch(options) {
@@ -20,9 +21,7 @@ App({
     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" //线上地址
+    globalUrl: globalUrl,
+    globalUrl2: globalUrl2
   }
 });

config.js

+export const globalUrl = "https://gateway-beta.mingwork.com";
+export const globalUrl2 = "https://third-authentication-beta.mingwork.com";
\ No newline at end of file