Skip to content

S
schedule
Commit 7b283976 by fengzhaoyu
Options

merge

parents 4e117054 8fdad962
Showing with 6 additions and 2 deletions
pages/appDetails/appDetails.js
...@@ -34,7 +34,7 @@ create.Page({ ...@@ -34,7 +34,7 @@ create.Page({
if (requestNum >= 300) { if (requestNum >= 300) {
requestNum = 0; requestNum = 0;
that.setData({ that.setData({
isBind: true, isBind: false,
isLoading: false isLoading: false
}); });
clearInterval(interval); clearInterval(interval);
......
pages/index/index.js
...@@ -780,7 +780,11 @@ create.Page({ ...@@ -780,7 +780,11 @@ create.Page({
maxClickCount--; maxClickCount--;
if (maxClickCount == 0) { if (maxClickCount == 0) {
dd.alert({ dd.alert({
<<<<<<< HEAD
content: "0.0.7" content: "0.0.7"
=======
content: "0.0.9"
>>>>>>> dev
}); });
maxClickCount = 5; maxClickCount = 5;
} }
......
pages/meetingDetail/meetingDetail.acss
...@@ -117,7 +117,7 @@ page { ...@@ -117,7 +117,7 @@ page {
} }
.hideTitle { .hideTitle {
font-family: PingFangSC-Medium; font-family: PingFangSC-Regular;
font-size: 40rpx; font-size: 40rpx;
line-height: 56rpx; line-height: 56rpx;
color: #1B263D; color: #1B263D;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment