Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test

Andy
2 parents a56e0438 2efd6d53
Showing 3 changed files with 5 additions and 3 deletions
resource/public/commoncss.css
topages/workfill/workfill.css
topages/workfill/workfill.js
@@ -4,7 +4,7 @@
 html,body{
     background-color: #f6f7fb;
     min-width: 1200px;
-    font-family:”微软雅黑”;
+    font-family:"PingFang SC","微软雅黑","Microsoft YaHei",Helvetica,"Helvetica Neue",Tahoma,Arial,sans-serif;
 }
 ul,li{
     list-style: none;
@@ -28,7 +28,9 @@
     background-color: #fff;
     border-radius: 4px;
 }
-
+.workquery-list-wrap{
+    margin-top: 10px;
+}
 .workfill-list-wrap .workfill-list-li{
     width: 277px;
     height: 450px;
@@ -65,7 +65,7 @@ var fun = {
     //退出
     logout:function(){
         documentBindFunc.on('click','#logoutId',function(){
-            debugger;
+            // debugger;
            fn.loginOut();
        });
     },