Merge branch 'branch' of http://192.168.1.195:9998/web_developers/javaplatform into branch

liuqimichale
2 parents 74789c12 887ce88f
Showing 10 changed files with 34 additions and 8 deletions
css/login.css
index.html
js/common.js
js/index.js
js/pdalatform.js
js/thirdparty.js
js/wechatlatform.js
pdalatform.html
thirdparty.html
wechatlatform.html
@@ -182,3 +182,7 @@ body{
 .display-hide{
     display: none;
 }
+.alert-danger{
+    background-color: #fff !important;
+    border-color: #fff !important;
+}
 \ No newline at end of file
@@ -22,7 +22,7 @@
             <!--<span></span>-->
             <span class="java-title"></span>
         </div>
-        <div class="java-loginout float-right">
+        <div class="java-loginout float-right" id="login_out_btn">
             <!--<span class="java-loginout"></span>-->
         </div>
 </header>
@@ -531,6 +531,8 @@
 <script type="text/javascript" src="js/libJs/jquery.min.js"></script>
 <script type="text/javascript" src="js/libJs/bootstrap.min.js"></script>
 <script src="https://cdn.bootcss.com/echarts/3.6.1/echarts.min.js"></script>
+<script type="text/javascript" src="js/unit.js"></script>
+<script type="text/javascript" src="js/common.js"></script>
 <script type="text/javascript">
     document.write("<s" + "cript type='text/javascript' src='js/index.js?ver" + Math.random() + "'></s" + "cript>");
 </script>
+/**
+ * Created by chenbiao on 2017/11/21.
+ */
+//用户退出登录
+$('#login_out_btn').on('click', function () {
+    // console.log("token:" + fn.getToken());
+    fn.loginOut();
+});
 \ No newline at end of file
@@ -117,4 +117,5 @@ $(document).delegate(&#39;#list-con-wrap li span&#39;,&#39;click&#39;,function () {
    alert(id);
     $('#list-main-wrap').addClass('display-none');
    $('#list-detail-wrap').removeClass('display-none');
-});
 \ No newline at end of file
+});
+
@@ -117,4 +117,5 @@ $(document).delegate(&#39;#list-con-wrap li span&#39;,&#39;click&#39;,function () {
     alert(id);
     $('#list-main-wrap').addClass('display-none');
     $('#list-detail-wrap').removeClass('display-none');
-});
 \ No newline at end of file
+});
+
+/**
+ * Created by chenbiao on 2017/11/21.
+ */
@@ -117,4 +117,5 @@ $(document).delegate(&#39;#list-con-wrap li span&#39;,&#39;click&#39;,function () {
     alert(id);
     $('#list-main-wrap').addClass('display-none');
     $('#list-detail-wrap').removeClass('display-none');
-});
 \ No newline at end of file
+});
+
@@ -22,7 +22,7 @@
         <!--<span></span>-->
         <span class="java-title"></span>
     </div>
-    <div class="java-loginout float-right">
+    <div class="java-loginout float-right" id="login_out_btn">
         <!--<span class="java-loginout"></span>-->
     </div>
 </header>
@@ -531,6 +531,9 @@
 <script type="text/javascript" src="js/libJs/jquery.min.js"></script>
 <script type="text/javascript" src="js/libJs/bootstrap.min.js"></script>
 <script src="https://cdn.bootcss.com/echarts/3.6.1/echarts.min.js"></script>
+<script type="text/javascript" src="js/unit.js"></script>
+<script type="text/javascript" src="js/common.js"></script>
+
 <script type="text/javascript">
     document.write("<s" + "cript type='text/javascript' src='js/pdalatform.js?ver" + Math.random() + "'></s" + "cript>");
 </script>
@@ -22,7 +22,7 @@
         <!--<span></span>-->
         <span class="java-title"></span>
     </div>
-    <div class="java-loginout float-right">
+    <div class="java-loginout float-right" id="login_out_btn">
         <!--<span class="java-loginout"></span>-->
     </div>
 </header>
@@ -83,6 +83,7 @@
 <script type="text/javascript" src="js/libJs/jquery.min.js"></script>
 <script type="text/javascript" src="js/libJs/bootstrap.min.js"></script>
-
+<script type="text/javascript" src="js/unit.js"></script>
+<script type="text/javascript" src="js/common.js?s=2"></script>
 </body>
 </html>
 \ No newline at end of file
@@ -21,7 +21,7 @@
         <!--<span></span>-->
         <span class="java-title"></span>
     </div>
-    <div class="java-loginout float-right">
+    <div class="java-loginout float-right" id="login_out_btn">
         <!--<span class="java-loginout"></span>-->
     </div>
 </header>
@@ -530,6 +530,8 @@
 <script type="text/javascript" src="js/libJs/jquery.min.js"></script>
 <script type="text/javascript" src="js/libJs/bootstrap.min.js"></script>
 <script src="https://cdn.bootcss.com/echarts/3.6.1/echarts.min.js"></script>
+<script type="text/javascript" src="js/unit.js"></script>
+<script type="text/javascript" src="js/common.js"></script>
 <script type="text/javascript">
     document.write("<s" + "cript type='text/javascript' src='js/wechatlatform.js?ver" + Math.random() + "'></s" + "cript>");
 </script>