Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -56,10 +56,10 @@
         });
 
         var uptownId = $("#uptownId").val();
-        if (uptownId == '1238790987234'){
-            $('#ribao_trip')[0].style.display = 'none';
-        }else{
+        if (uptownId == '5'){ //1238790987234
             $('#ribao_trip')[0].style.display = '';
+        }else{
+            $('#ribao_trip')[0].style.display = 'none';
         }
         ribao_init();
         qiuzhu_init();