diff --git a/api/request.js b/api/request.js index c86656f..ef8066e 100644 --- a/api/request.js +++ b/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¤t=${page}` + url: `/meet/meeting-log/scheduleTemplateMeetingLogPage?groupId=${groupId}&size=10¤t=${page}` }); } //会议室详情的获取动态列表 diff --git a/app.js b/app.js index 5e9e71c..ff490cb 100644 --- a/app.js +++ b/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 } }); diff --git a/config.js b/config.js new file mode 100644 index 0000000..8fbfe38 --- /dev/null +++ b/config.js @@ -0,0 +1,2 @@ +export const globalUrl = "https://gateway-beta.mingwork.com"; +export const globalUrl2 = "https://third-authentication-beta.mingwork.com"; \ No newline at end of file