Skip to content

Commit 306c000

Browse files
childeYinchildeYin
committed
fix upgrade css
1 parent 9062419 commit 306c000

6 files changed

Lines changed: 74 additions & 11 deletions

File tree

‎src/public/css/upgrade.css‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,53 @@ body,html {
217217
font-weight:400;
218218
color:rgba(153,153,153,1);
219219
padding-left: 1rem;
220+
}
221+
@media (max-width: 500px) {
222+
body, html {
223+
background-color: #f4f4f4;
224+
height: 100%;
225+
font-size: 10.66px;
226+
padding: 0;
227+
margin: 0;
228+
-webkit-tap-highlight-color: transparent;
229+
}
230+
.zaly_init {
231+
width: 90%;
232+
position: absolute;
233+
left: 0;
234+
right: 0;
235+
background: rgba(243, 243, 243, 1);
236+
box-shadow: 0rem 0.94rem 1.41rem 0.47rem rgba(74, 56, 180, 1);
237+
border-radius: 0.94rem;
238+
}
239+
.upgrade_title {
240+
font-size: 1.69rem;
241+
}
242+
.upgrade_token {
243+
font-size: 1.69rem;
244+
width:90%;
245+
}
246+
.upgrade_tip {
247+
font-size: 1.31rem;
248+
margin-left: 2rem;
249+
}
250+
.upgrade_process {
251+
margin-top: 3rem;
252+
display: flex;
253+
justify-content: center;
254+
margin-left: 2rem;
255+
width: 90%;
256+
}
257+
.zaly_site_upgrade {
258+
width: 80%;
259+
margin: 0 auto;
260+
background: rgba(255,255,255,1);
261+
border-radius: 0.94rem;
262+
}
263+
.zaly_site_upgrade_tip {
264+
height: 5.63rem;
265+
margin-left: 2rem;
266+
word-break: break-all;
267+
width: 90%;
268+
}
220269
}

‎src/public/js/upgrade/upgrade.js‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ var currentUpgradeVersionKey = "current_upgrade_version";
66
var endUpgradeVersionKey = "end_upgrade_version";
77
var upgradeId = undefined;
88
var needUpgrade =$(".needUpgrade").val();
9-
console.log("$needUpgrade=="+needUpgrade);
10-
119

1210
//-------------------------------------page upgrade int------------------------------------
1311

@@ -124,16 +122,28 @@ function sendUpgrade() {
124122
});
125123
}
126124

125+
function isPhone(){
126+
if((/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) || isWeixinBrowser()) {
127+
return true;
128+
}
129+
return false;
130+
}
131+
127132
function upgradeSiteVersion() {
128133
var upgradeVersionNum = localStorage.getItem(currentUpgradeVersionKey);
129134
updateUpgradeProgress("done", "");
130135
var nextUpgradeVersionNum = Number(Number(upgradeVersionNum)+1);
131136
localStorage.setItem(currentUpgradeVersionKey, nextUpgradeVersionNum);
132137
var endUpgradeNum = localStorage.getItem(endUpgradeVersionKey);
133138
if(nextUpgradeVersionNum > Number(endUpgradeNum)) {
134-
var html = "升级完成，前往站点";
139+
if(isPhone()) {
140+
var html = "升级完成，关闭当前页面";
141+
$(".upgrade_staring_btn").attr("goto", "close_page");
142+
}else {
143+
var html = "升级完成，前往站点";
144+
$(".upgrade_staring_btn").attr("goto", "site");
145+
}
135146
$(".upgrade_staring_btn").html(html);
136-
$(".upgrade_staring_btn").attr("goto", "site");
137147
$(".upgrade_staring_btn").attr("disabled", false);
138148
return;
139149
};
@@ -214,6 +224,9 @@ $(document).on("click", ".upgrade_staring_btn", function () {
214224
if(goto == "site") {
215225
window.location.href="./index.php";
216226
return;
227+
} else if(goto == "close_page") {
228+
zalyjsNavClosePlugin();
229+
return;
217230
}
218231
var html = "正在升级...";
219232
$(this).html(html);

‎src/public/js/zalyjsNative.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,10 @@ function zalyjsLoginConfig(callback) {
202202
function zalyjsNavClosePlugin()
203203
{
204204
if (isAndroid()) {
205-
window.Android.zalyjsNavClosePlugin()
205+
console.log("is android");
206+
window.Android.zalyjsNavClose()
206207
} else if(isIOS()) {
207-
window.webkit.messageHandlers.zalyjsNavClosePlugin()
208+
window.webkit.messageHandlers.zalyjsNavClose()
208209
}
209210
}
210211

‎src/views/init/init.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<title>login</title>
5+
<title>初始化站点</title>
66
<!-- Latest compiled and minified CSS -->
77
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
88
<link rel="stylesheet" href="../../public/css/init.css?_version=<?php echo $versionCode?>">

‎src/views/msg/groupMsg.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<meta charset="UTF-8">
6-
<title>DuckChat 私有部署IM、社群运营神奇，支持iOS、Android、Web，最多支持500台服务器集群！</title>
6+
<title>主页面</title>
77
<link rel="stylesheet" href="../../public/css/zaly-action-row.css?_version=<?php echo $versionCode?>" />
88
<link rel="stylesheet" href="../../public/css/zaly_contact.css?_version=<?php echo $versionCode?>" />
99
<link rel="stylesheet" href="../../public/css/zaly_apply_friend_list.css?_version=<?php echo $versionCode?>" />
@@ -140,8 +140,6 @@ function getRemPx()
140140
return;
141141
}
142142
});
143-
144-
145143
}
146144

147145
</script>

‎src/views/upgrade/upgrade.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5-
<title>login</title>
5+
<title>升级站点</title>
66
<!-- Latest compiled and minified CSS -->
77
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
88
<link rel="stylesheet" href="../../public/css/upgrade.css?_version=<?php echo $versionCode?>">
99
<script type="text/javascript" src="../../../public/js/jquery.min.js"></script>
1010
<script src="../../public/js/template-web.js?_version=<?php echo $versionCode?>"></script>
1111
<script src="../../public/js/zalyjsHelper.js?_version=<?php echo $versionCode?>"></script>
12+
<script src="../../public/js/zalyjsNative.js?_version=<?php echo $versionCode?>"></script>
1213
<script src="../../public/js/jquery.i18n.properties.min.js?_version=<?php echo $versionCode?>"></script>
1314
</head>
1415
<body>
@@ -30,5 +31,6 @@
3031
<?php include (dirname(__DIR__) . '/upgrade/template_upgrade.php');?>
3132
<script src="../../public/js/upgrade/upgrade.js?_version=<?php echo $versionCode?>"></script>
3233

34+
3335
</body>
3436
</html>

0 commit comments

Comments
 (0)