Merge remote-tracking branch 'origin/v2.0' into v2.0
zhizou
commit
f1083f4dbc
53
index.html
53
index.html
|
|
@ -30,9 +30,8 @@
|
||||||
<li class="ok-nav-item ok-hide-md">
|
<li class="ok-nav-item ok-hide-md">
|
||||||
<!-- 天气信息 -->
|
<!-- 天气信息 -->
|
||||||
<div class="weather-ok">
|
<div class="weather-ok">
|
||||||
<iframe frameborder="0" scrolling="no" class="iframe-style" src="./weather.html" frameborder="0"></iframe>
|
<iframe frameborder="0" scrolling="no" class="iframe-style" src="pages/weather.html" frameborder="0"></iframe>
|
||||||
</div>
|
</div>
|
||||||
<!--<div id="tp-weather-widget"></div>-->
|
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="layui-nav layui-layout-right">
|
<ul class="layui-nav layui-layout-right">
|
||||||
|
|
@ -141,56 +140,6 @@
|
||||||
<div class="yy"></div>
|
<div class="yy"></div>
|
||||||
<!--js逻辑-->
|
<!--js逻辑-->
|
||||||
<script src="lib/layui/layui.js"></script>
|
<script src="lib/layui/layui.js"></script>
|
||||||
<!--<script src="lib/nprogress/nprogress.js"></script>-->
|
|
||||||
<script src="js/okadmin.js"></script>
|
<script src="js/okadmin.js"></script>
|
||||||
|
|
||||||
<!--中国天气预报插件-->
|
|
||||||
<!-- ok-admin-weather -->
|
|
||||||
<!--<script type="text/javascript">-->
|
|
||||||
<!--WIDGET = {FID: 'acC5MsrKTi'}-->
|
|
||||||
<!--</script>-->
|
|
||||||
<!--<script type="text/javascript" src="https://apip.weatherdt.com/float/static/js/r.js?v=1111"></script>-->
|
|
||||||
<!--知心天气预报插件-->
|
|
||||||
<!--<script type="text/javascript">
|
|
||||||
(function (T, h, i, n, k, P, a, g, e) {
|
|
||||||
g = function () {
|
|
||||||
P = h.createElement(i);
|
|
||||||
a = h.getElementsByTagName(i)[0];
|
|
||||||
P.src = k;
|
|
||||||
P.charset = "utf-8";
|
|
||||||
P.async = 1;
|
|
||||||
a.parentNode.insertBefore(P, a)
|
|
||||||
};
|
|
||||||
T["ThinkPageWeatherWidgetObject"] = n;
|
|
||||||
T[n] || (T[n] = function () {
|
|
||||||
(T[n].q = T[n].q || []).push(arguments)
|
|
||||||
});
|
|
||||||
T[n].l = +new Date();
|
|
||||||
if (T.attachEvent) {
|
|
||||||
T.attachEvent("onload", g)
|
|
||||||
} else {
|
|
||||||
T.addEventListener("load", g, false)
|
|
||||||
}
|
|
||||||
}(window, document, "script", "tpwidget", "//widget.seniverse.com/widget/chameleon.js"));
|
|
||||||
</script>
|
|
||||||
<script type="text/javascript">
|
|
||||||
tpwidget("init", {
|
|
||||||
"flavor": "slim",
|
|
||||||
"location": "WX4FBXXFKE4F",
|
|
||||||
"geolocation": "enabled",
|
|
||||||
"language": "zh-chs",
|
|
||||||
"unit": "c",
|
|
||||||
"theme": "chameleon",
|
|
||||||
"container": "tp-weather-widget",
|
|
||||||
"bubble": "disabled",
|
|
||||||
"alarmType": "badge",
|
|
||||||
"color": "#FFFFFF",
|
|
||||||
"uid": "U9EC08A15F",
|
|
||||||
"hash": "039da28f5581f4bcb5c799fb4cdfb673"
|
|
||||||
});
|
|
||||||
tpwidget("show");
|
|
||||||
</script>-->
|
|
||||||
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>中国天气</title>
|
||||||
|
<style>
|
||||||
|
#weather-float-he {
|
||||||
|
position: fixed!important;
|
||||||
|
z-index: 99999!important;
|
||||||
|
left: 0!important;
|
||||||
|
top: 0!important;
|
||||||
|
transform: scale(.9);
|
||||||
|
}
|
||||||
|
#weather-float-he div[data-v-0a6ec0b4]{
|
||||||
|
box-shadow: none!important;
|
||||||
|
top: 42px!important;
|
||||||
|
}
|
||||||
|
#weather-float-he div[data-v-0a6ec0b4] div{
|
||||||
|
position:static!important;
|
||||||
|
}
|
||||||
|
body,html{
|
||||||
|
margin: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: max-content;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<script type="text/javascript">
|
||||||
|
WIDGET = {
|
||||||
|
FID: 'FS17XUsOiV'
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<script type="text/javascript" src="https://apip.weatherdt.com/float/static/js/r.js?v=1111"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
34
weather.html
34
weather.html
|
|
@ -1,34 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>中国天气</title>
|
|
||||||
<style>
|
|
||||||
#weather-float-he {
|
|
||||||
position: fixed!important;
|
|
||||||
z-index: 99999!important;
|
|
||||||
left: 0!important;
|
|
||||||
top: 0!important;
|
|
||||||
transform: scale(.9);
|
|
||||||
}
|
|
||||||
#weather-float-he div[data-v-0a6ec0b4]{
|
|
||||||
box-shadow: none!important;
|
|
||||||
top: 42px!important;
|
|
||||||
}
|
|
||||||
#weather-float-he div[data-v-0a6ec0b4] div{
|
|
||||||
position:static!important;
|
|
||||||
}
|
|
||||||
body,html{
|
|
||||||
margin: 0;
|
|
||||||
width: 100%;
|
|
||||||
height: max-content;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<script type="text/javascript">
|
|
||||||
WIDGET = {FID: 'FS17XUsOiV'}
|
|
||||||
</script>
|
|
||||||
<script type="text/javascript" src="https://apip.weatherdt.com/float/static/js/r.js?v=1111"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
<!-- ok-admin-weather -->
|
|
||||||
Loading…
Reference in New Issue