Merge branch 'develop' of zhengxifeng/tyqngp into master

.gitignore

@@ -5,3 +5,5 @@ static/
 *.sql
 *.zip
 config/database.php
+favicon.ico
+

template/dafeult/wap/city.html

@@ -26,7 +26,7 @@
   <style>
   		*{padding:0;margin:0}
           .citylist{    width: 1200px;
-      margin: 0 auto; padding:50px 0 100px;  }
+      margin: 0 auto; padding:15px 0 5px;  }
           .citylist .tips{ color:#999; text-align: center; margin-bottom: 20px; }
           .citylist dl{ margin-bottom: 20px; position: relative; padding-left:90px; min-height: 30px; }
           .citylist dl dt{ position: absolute; left: 0; background:#05B381; min-width: 80px; color:#fff; border-radius: 4px; }

template/dafeult/wap/foot.html

@@ -32,31 +32,18 @@
   </div>
 </div>
 <div class="footer-nav">
-  <ul>
-    <li> <a href="{pboot:httpurl}/"> <span class="icon iconfont icon-shouye"></span>
-      <p>首页</p>
-      </a> </li>
-    {pboot:sort scode=1}
-    <li> <a href="[sort:link]"> <span class="icon iconfont icon-xihuan"></span>
-      <p>[sort:name]</p>
-      </a> </li>
-    {/pboot:sort}
-    {pboot:sort scode=6}
-    <li > <a href="[sort:link]"> <span class="icon iconfont icon-wode"></span>
-      <p>[sort:name]</p>
-      </a> </li>
-    {/pboot:sort}
-    {pboot:sort scode=7}
-    <li > <a href="[sort:link]"> <span class="icon iconfont icon-dianpu"></span>
-      <p>[sort:name]</p>
-      </a> </li>
-    {/pboot:sort}
-    {pboot:sort scode=9}
-    <li > <a href="[sort:link]"> <span class="icon iconfont icon-wangwang"></span>
-      <p>[sort:name]</p>
-      </a> </li>
-    {/pboot:sort}
+
+  <ul style="padding-top:4px;">
+  {pboot:nav parent=26}
+  <li style="width:[nav:subname];text-align: center;">
+    <a href="[nav:link]">
+      <img src="[nav:ico]" style="width:auto;height:25px;"/>
+      <p>[nav:name]</p>
+    </a>
+  </li>
+  {/pboot:nav}
   </ul>
+
 </div>
 <script type="text/javascript" src="{pboot:sitedomain}/m/js/common_m.js"></script> 
 <!--页脚 结束-->

template/dafeult/wap/nav.html

@@ -0,0 +1,35 @@
+<ul style="display: none;">
+    <li> <a href="{pboot:httpurl}/">
+        <!--    <img src="" style="width:25px;height:25px;"/>-->
+        <span class="icon iconfont icon-shouye"></span>
+        <p>首页</p>
+    </a> </li>
+    {pboot:sort scode=1}
+    {pboot:if('[sort:is_show]' == '1')}
+    <li> <a href="[sort:link]"> <span class="icon iconfont icon-xihuan"></span>
+        <p>[sort:name]</p>
+    </a> </li>
+    {/pboot:if}
+    {/pboot:sort}
+    {pboot:sort scode=6}
+    {pboot:if('[sort:is_show]' == '1')}
+    <li > <a href="[sort:link]"> <span class="icon iconfont icon-wode"></span>
+        <p>[sort:name]</p>
+    </a> </li>
+    {/pboot:if}
+    {/pboot:sort}
+    {pboot:sort scode=7}
+    {pboot:if('[sort:is_show]' == '1')}
+    <li > <a href="[sort:link]"> <span class="icon iconfont icon-dianpu"></span>
+        <p>[sort:name]</p>
+    </a> </li>
+    {/pboot:if}
+    {/pboot:sort}
+    {pboot:sort scode=9}
+    {pboot:if('[sort:is_show]' == '1')}
+    <li > <a href="[sort:link]"> <span class="icon iconfont icon-wangwang"></span>
+        <p>[sort:name]</p>
+    </a> </li>
+    {/pboot:if}
+    {/pboot:sort}
+</ul>