merge

pages/appDetails/appDetails.js

@@ -34,7 +34,7 @@ create.Page({
       if (requestNum >= 300) {
         requestNum = 0;
         that.setData({
-          isBind: true,
+          isBind: false,
           isLoading: false
         });
         clearInterval(interval);

pages/index/index.js

@@ -780,7 +780,11 @@ create.Page({
     maxClickCount--;
     if (maxClickCount == 0) {
       dd.alert({
+<<<<<<< HEAD
         content: "0.0.7"
+=======
+        content: "0.0.9"
+>>>>>>> dev
       });
       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;