Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-ui/templates/home/frag.head.ftl

@@ -36,14 +36,14 @@
         }
         .user-title-long {
             text-align: center;
-            font-size: 15px;
+            font-size: 25px;
             color: #000000;
             font-weight: 900;
             margin: 0 15%;
         }
         .user-title-big {
             text-align: center;
-            font-size: 30px;
+            font-size: 40px;
             color: #000000;
             font-weight: 900;
             margin: 0 15%;

whepi-ui/templates/user/returnWork.ftl

@@ -6,11 +6,13 @@
         <div class="weui-tab__bd-item weui-tab__bd-item--active">
             <div class="page__bd">
                 <header class="user-header">
-                    <br/>
-                    <br/>
                     <#if (uptownId??) && (uptownId == 1238790987234 || uptownId == 5 )>
                         <img class="user-title" style="height: 60px;width: 70px;" id="qr" src="/ly.png"/>
                     </#if>
+                    <#if (uptownId??) && (uptownId != 1238790987234 && uptownId != 5 )>
+                        <br/>
+                        <br/>
+                    </#if>
                     <p class="user-title-long">${doorplate!''}</p>
                     <br/>
                     <p class="user-title-long">${name!''}</p>

whepi-ui/templates/user/scan.ftl

@@ -6,8 +6,6 @@
         <div class="weui-tab__bd-item weui-tab__bd-item--active">
             <div class="page__bd">
                 <header class="user-header">
-                    <br/>
-                    <br/>
                     <#if (uptownId??) && (uptownId == 1238790987234 || uptownId == 5 )><img class="user-title" style="height: 60px;width: 70px;" id="qr" src="/ly.png"/></#if>
                     <#if (uptownId??) && (uptownId != 1238790987234 && uptownId != 5 )><br/>
                         <br/>

whepi-ui/templates/user/scanEstate.ftl

@@ -9,8 +9,6 @@
                     <br/>
                     <br/>
                     <br/>
-                    <br/>
-                    <br/>
                     <p class="user-title-long">${doorplate!''}</p>
                     <br/>
                     <p class="user-title-long">${name!''}</p>