合并分支 'lihong' 到 'master'

修改



查看合并请求 !231

@@ -10,7 +10,15 @@
     <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/write/deal_list.css" />
     <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/write/deal_list.css" />
     <title>已提交订单</title>
     <title>已提交订单</title>
     <style type="text/css">
     <style type="text/css">
-
+        .foot_icon{
+            display: flex;
+            justify-content: center;
+            /* position: absolute; */
+            position: fixed;
+            bottom: 0.2rem;
+            left: 0;
+            right: 0;
+        }
     </style>
     </style>
 </head>
 </head>
 
 
@@ -72,7 +80,7 @@
     <!--<p class="order_data">提交时间：2018-04-10</p>-->
     <!--<p class="order_data">提交时间：2018-04-10</p>-->
 <!--</div>-->
 <!--</div>-->
 
 
-<div class="bottom_icon">
+<div class="footstyle bottom_icon">
     <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
     <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
     <p class="bottom_text">{$site_info.site_name}</p>
     <p class="bottom_text">{$site_info.site_name}</p>
 </div>
 </div>
@@ -190,8 +198,11 @@
             popup_switch = true
             popup_switch = true
         }
         }
     }
     }
+    var h=$(".deal_list").height();
+    if(h>445){
 
 
-    alert($(".deal_list").height())
+    }
+   // alert($(".deal_list").height())
 </script>
 </script>
 </body>
 </body>