Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -9,8 +9,10 @@
             <#include "/home/ribao.ftl" /></div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/home/qiuzhu.ftl" /></div>
+        <#if uptownId != 1238790987234 && uptownId != 5>
         <div id="tab3" class="weui-tab__bd-item">
-    <#include "/home/buy.ftl" /></div>
+            <#include "/home/buy.ftl" /></div>
+        </#if>
     <#--<div id="tab4" class="weui-tab__bd-item">-->
     <#--<h1>页面四</h1> </div>-->
     </div>
@@ -23,10 +25,12 @@
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">家庭求助</p>
         </a>
+        <#if uptownId != 1238790987234 && uptownId != 5>
         <a id="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
             <p class="weui-tabbar__label">团购</p>
         </a>
+        </#if>
     <#--<a href="#tab4" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
     <#--<p class="weui-tabbar__label">我</p>-->
@@ -59,11 +63,11 @@
         });
 
         var uptownId = $("#uptownId").val();
-        if (uptownId == xiaoquId || uptownId == ceshixiaoquId){
+        if (uptownId == xiaoquId || uptownId == ceshixiaoquId) {
             $('#ribao_trip')[0].style.display = '';
             $('#ribao_djgl')[0].style.display = 'none';
             $('#ribao_jbqk')[0].style.display = 'none';
-        }else{
+        } else {
             $('#ribao_trip')[0].style.display = 'none';
             $('#ribao_djgl')[0].style.display = '';
             $('#ribao_jbqk')[0].style.display = '';
@@ -177,6 +181,7 @@
             }
         });
     }
+
     // 凌云更换工号后保存
     function changeDoorplate() {
         var doorplate = $("#doorplateMsg").text();