From f4d67b4fd36492944462980e31e89abc83b3ddb8 Mon Sep 17 00:00:00 2001
From: zhizou <jl199508026@163.com>
Date: Mon, 1 Jul 2019 11:34:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/okadmin-v2.css | 11 ++++++
 index.html         | 92 +++++++++++++++++++++++++---------------------
 weather.html       | 27 ++++++++++++++
 3 files changed, 89 insertions(+), 41 deletions(-)
 create mode 100644 weather.html

diff --git a/css/okadmin-v2.css b/css/okadmin-v2.css
index e02fe34..4b60b7e 100644
--- a/css/okadmin-v2.css
+++ b/css/okadmin-v2.css
@@ -466,6 +466,17 @@
     background: #F2F2F2;
 }
 
+/*中国天气样式*/
+.weather-ok{
+    height: 49px;
+    line-height: 49px;
+}
+.weather-ok .iframe-style{
+    /*height: 415px;*/
+    height: 375px;
+    padding-top: 5px;
+}
+
 /*主体内容样式*/
 .okadmin .content-body {
     position: absolute;
diff --git a/index.html b/index.html
index 3058ccf..00e1ebd 100644
--- a/index.html
+++ b/index.html
@@ -29,9 +29,10 @@
          </li>
          <li class="ok-nav-item ok-hide-md">
             <!-- 天气信息 -->
-            <div class="weather">
-               <div id="tp-weather-widget"></div>
+            <div class="weather-ok">
+               <iframe frameborder="0" scrolling="no" class="iframe-style" src="./weather.html" frameborder="0"></iframe>
             </div>
+            <!--<div id="tp-weather-widget"></div>-->
          </li>
       </ul>
       <ul class="layui-nav layui-layout-right">
@@ -60,7 +61,7 @@
             </a>
             <dl id="userInfo" class="layui-nav-child">
                <dd><a lay-id="u-1" href="javascript:;" data-url="pages/user/user.html">个人中心<span
-                   class="layui-badge-dot"></span></a></dd>
+                       class="layui-badge-dot"></span></a></dd>
                <dd><a lay-id="u-2" href="javascript:;" data-url="pages/user/user-info.html">基本资料</a></dd>
                <dd><a lay-id="u-3" href="javascript:;" data-url="pages/user/changePwd.html">安全设置</a></dd>
                <dd>
@@ -142,45 +143,54 @@
 <script src="lib/layui/layui.js"></script>
 <!--<script src="lib/nprogress/nprogress.js"></script>-->
 <script src="js/okadmin.js"></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"))
+
+<!--中国天气预报插件-->
+<!-- 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>
+  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>
 </html>
diff --git a/weather.html b/weather.html
new file mode 100644
index 0000000..3f9c4b2
--- /dev/null
+++ b/weather.html
@@ -0,0 +1,27 @@
+<!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);
+      }
+      body,html{
+         margin: 0;
+         width: 100%;
+         height: max-content;
+      }
+   </style>
+</head>
+<body>
+<script type="text/javascript">
+  WIDGET = {FID: 'RgKVDBQZUQ'}
+</script>
+<script type="text/javascript" src="https://apip.weatherdt.com/float/static/js/r.js?v=1111"></script>
+</body>
+</html>
+<!-- ok-admin-weather -->