Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -24,7 +24,7 @@
         </a>
         <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>
+            <p class="weui-tabbar__label">团购</p>
         </a>
     <#--<a href="#tab4" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->

whepi-ui/templates/yeweihui/home.ftl

@@ -32,7 +32,7 @@
             <p class="weui-tabbar__label">求助</p>
         </a>
         <a id="tab3a" href="#tab3" class="weui-tabbar__item">
-            <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
             <p class="weui-tabbar__label">团购</p>
         </a>
     <#--<a href="#tab3" class="weui-tabbar__item">-->