Merge branch 'release/2.0.0' into release/dev/2.0.0

# Conflicts:
#	config.js

config.js

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

pages/createMeeting/constant.js

@@ -17,5 +17,5 @@ export const aheadTimeList = [
     { id: 60, text: '提前一小时提醒', icon: '' },
     { id: 120, text: '提前二小时提醒', icon: '' },
     { id: 1440, text: '提前一天提醒', icon: '' },
-    { id: 105120, text: '提前一周提醒', icon: '' }
+    { id: 10080, text: '提前一周提醒', icon: '' }
 ]
\ No newline at end of file

pages/index/index.js

@@ -25,6 +25,7 @@ import create from "dd-store";
 import pageStore from '../meetingDetail/store';
 import { version } from '../../config';
 // const webSocket = require('../../utils/websocket.js');
+import { websocketUrl } from '../../config';
 
 const currentDate = new Date();
 const minYear = currentDate.getFullYear();
@@ -94,7 +95,7 @@ create.Page({
 
     // 设置标题
     dd.setNavigationBar({
-      title: this.$store.data.tabBarIndex == 1 ? '日程' : '动态'
+      title: this.$store.data.tabBarIndex == 1 ? '安排' : '动态'
     });
 
     //定位
@@ -183,7 +184,7 @@ create.Page({
   },
   connect_start() {
     dd.connectSocket({
-      url: `ws://139.196.213.18:9999/meet-websocket/websocket/${dd.getStorageSync({ key: 'mwUserId' }).data}/${uuid}`,
+      url: `${websocketUrl}/meet-websocket/websocket/${dd.getStorageSync({ key: 'mwUserId' }).data}/${uuid}`,
 
       success: (res) => {
 

pages/meetingDetail/constant.js

@@ -8,7 +8,7 @@ export const aheadTimeList = [
     { id: 60, text: '提前一小时提醒', icon: '' },
     { id: 120, text: '提前二小时提醒', icon: '' },
     { id: 1440, text: '提前一天提醒', icon: '' },
-    { id: 105120, text: '提前一周提醒', icon: '' }
+    { id: 10080, text: '提前一周提醒', icon: '' }
 ]
 export const participateStatusList = [{ text: '仅参加此次会议', id: 'only', value: 1 }, { text: '参加所有会议', id: 'all', value: 1 }]
 export const noParticipateStatusList = [{ text: '不参加此次会议', id: 'only', value: 0 }, { text: '不参加所有会议', id: 'all', value: 0 }]