Merge branch 'dev' of http://gitlab.roboming.com/fengzhaoyu/schedule into dev

app.js

@@ -20,9 +20,9 @@ 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: "https://gateway-beta.mingwork.com", //beta地址
+    // globalUrl2: "https://third-authentication-beta.mingwork.com"
+    globalUrl: "https://gateway2.mingwork.com", // 线上地址
+    globalUrl2: "https://third-authentication.mingwork.com" //线上地址
   }
 });

pages/index/index.js

@@ -780,7 +780,7 @@ create.Page({
     maxClickCount--;
     if (maxClickCount == 0) {
       dd.alert({
-        content: "0.0.5"
+        content: "0.0.9"
       });
       maxClickCount = 5;
     }

pages/meetingDetail/meetingDetail.acss

@@ -117,7 +117,7 @@ page {
 }
 
 .hideTitle {
-    font-family: PingFangSC-Medium;
+    font-family: PingFangSC-Regular;
     font-size: 40rpx;
     line-height: 56rpx;
     color: #1B263D;