Merge remote-tracking branch 'origin/master'

app/index/view/base.html

@@ -14,6 +14,10 @@
     <meta name="keywords" content="电子烟,关键字"/>
     <meta name="Description" content="网站描述"/>
     <title>{block name="title"}标题{/block}</title>
+    <script src="/assets/index/js/jquery-1.12.0.js"></script>
+    <script src="/assets/index/js/flexible.js"></script>
+    <script src="/assets/index/js/public.js?t=11"></script>
+    <script src="/assets/index/js/jquery.lazyload.js"></script>
     <link rel="stylesheet" href="/assets/index/css/common.css?t=108211111">
     <link rel="stylesheet" href="/assets/index/css/index.css">
     {block name="styles"}{/block}
@@ -338,10 +342,6 @@
 {block name="components"}{/block}
 
 </body>
-<script src="/assets/index/js/jquery-1.12.0.js"></script>
-<script src="/assets/index/js/flexible.js"></script>
-<script src="/assets/index/js/public.js?t=11"></script>
 <script src="/assets/index/js/productDetails.js?t=11"></script>
-<script src="/assets/index/js/jquery.lazyload.js"></script>
 {block name="scriptSrc"}{/block}
 </html>

public/assets/index/css/common.css

@@ -8,6 +8,7 @@ html {
     -ms-text-size-adjust: 100%;
     /* 解决IOS默认滑动很卡的情况 */
     -webkit-overflow-scrolling: touch;
+    font-size: 100px;
 }
 
 body {