Skip to content

S
schedule
Commit b66b4454 by liang ce
Options

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

parents 38d6c132 79f52116
Showing with 6 additions and 6 deletions
app.js
...@@ -20,9 +20,9 @@ App({ ...@@ -20,9 +20,9 @@ App({
userid: "", userid: "",
name: "", name: "",
userInfo: "", userInfo: "",
globalUrl: "https://gateway-beta.mingwork.com", //beta地址 // globalUrl: "https://gateway-beta.mingwork.com", //beta地址
globalUrl2: "https://third-authentication-beta.mingwork.com" // globalUrl2: "https://third-authentication-beta.mingwork.com"
// globalUrl: "https://gateway2.mingwork.com", // 线上地址 globalUrl: "https://gateway2.mingwork.com", // 线上地址
// globalUrl2: "https://third-authentication.mingwork.com" //线上地址 globalUrl2: "https://third-authentication.mingwork.com" //线上地址
} }
}); });
pages/index/index.js
...@@ -780,7 +780,7 @@ create.Page({ ...@@ -780,7 +780,7 @@ create.Page({
maxClickCount--; maxClickCount--;
if (maxClickCount == 0) { if (maxClickCount == 0) {
dd.alert({ dd.alert({
content: "0.0.5" content: "0.0.9"
}); });
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