Commit 68f446df07777cb46704558a59874d1592154b3b
Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test
Showing
3 changed files
with
5 additions
and
3 deletions
resource/public/commoncss.css
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | html,body{ | 4 | html,body{ |
| 5 | background-color: #f6f7fb; | 5 | background-color: #f6f7fb; |
| 6 | min-width: 1200px; | 6 | min-width: 1200px; |
| 7 | - font-family:”微软雅黑”; | 7 | + font-family:"PingFang SC","微软雅黑","Microsoft YaHei",Helvetica,"Helvetica Neue",Tahoma,Arial,sans-serif; |
| 8 | } | 8 | } |
| 9 | ul,li{ | 9 | ul,li{ |
| 10 | list-style: none; | 10 | list-style: none; |
topages/workfill/workfill.css
| @@ -28,7 +28,9 @@ | @@ -28,7 +28,9 @@ | ||
| 28 | background-color: #fff; | 28 | background-color: #fff; |
| 29 | border-radius: 4px; | 29 | border-radius: 4px; |
| 30 | } | 30 | } |
| 31 | - | 31 | +.workquery-list-wrap{ |
| 32 | + margin-top: 10px; | ||
| 33 | +} | ||
| 32 | .workfill-list-wrap .workfill-list-li{ | 34 | .workfill-list-wrap .workfill-list-li{ |
| 33 | width: 277px; | 35 | width: 277px; |
| 34 | height: 450px; | 36 | height: 450px; |
topages/workfill/workfill.js
| @@ -65,7 +65,7 @@ var fun = { | @@ -65,7 +65,7 @@ var fun = { | ||
| 65 | //退出 | 65 | //退出 |
| 66 | logout:function(){ | 66 | logout:function(){ |
| 67 | documentBindFunc.on('click','#logoutId',function(){ | 67 | documentBindFunc.on('click','#logoutId',function(){ |
| 68 | - debugger; | 68 | + // debugger; |
| 69 | fn.loginOut(); | 69 | fn.loginOut(); |
| 70 | }); | 70 | }); |
| 71 | }, | 71 | }, |