合并分支 '1iuzhen' 到 'master'

选择年龄页面底部公司名称位置调整



查看合并请求 !245

@@ -10,16 +10,14 @@
     <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/augly.css" />
     <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/augly.css" />
     <title>选择年龄</title>
     <title>选择年龄</title>
     <style type="text/css">
     <style type="text/css">
-        body,html{
-           height:100%;
-        }
-        .container {
-            height: 100%;
+        .content_height {
             background: url(__TMPL__/public/mobile/images/login_bg.png) center no-repeat;
             background: url(__TMPL__/public/mobile/images/login_bg.png) center no-repeat;
             background-size: 100% 100%;
             background-size: 100% 100%;
             padding-top: 1rem;
             padding-top: 1rem;
         }
         }
-
+        .container {
+            padding-top: 0;
+        }
 
 
         .input_num {
         .input_num {
             position: relative;
             position: relative;
@@ -38,6 +36,10 @@
             transform: translateY(-0.15rem);
             transform: translateY(-0.15rem);
             right: 0.3rem;
             right: 0.3rem;
         }
         }
+        .bottom_icon {
+            margin-bottom: 0;
+            margin-top: -0.7rem;
+        }
     </style>
     </style>
 </head>
 </head>
 
 
@@ -51,40 +53,41 @@
     </div>
     </div>
     选择宝宝年龄
     选择宝宝年龄
 </div>
 </div>
-<div class="container">
-    <!--<div class="header_wrap"></div>-->
-    <!--banner-->
-    <div class="login_img" style="margin-top: 2.9rem;">
-        <div class="baby_img">
-           <img src="__TMPL__/public/mobile/images/login_pic2.png" class="img_detail" />
+<div class="content_height">
+    <div class="container">
+        <!--<div class="header_wrap"></div>-->
+        <!--banner-->
+        <div class="login_img" style="margin-top: 2.9rem;">
+            <div class="baby_img">
+               <img src="__TMPL__/public/mobile/images/login_pic2.png" class="img_detail" />
+            </div>
+            <div class="login_text">
+                <p style="font-weight: bold;">选择宝宝年龄</p>
+                <span style="color: #CCCCCC;">Choose age</span>
+            </div>
         </div>
         </div>
-        <div class="login_text">
-            <p style="font-weight: bold;">选择宝宝年龄</p>
-            <span style="color: #CCCCCC;">Choose age</span>
+        <div class="input_num">
+            <p>宝宝年龄</p>
+            <input type="text" name="baby_age" id="age" value="" readonly class="input_text" placeholder="请选择宝宝年龄" />
+            <img src="__TMPL__/public/mobile/images/youjiantou.png" class="jiantou" />
+            <!--<select name="baby_age" class="input_text">-->
+                <!--<volist name="babyList" id="vo">-->
+                    <!--<option value="{$vo.id}">{$vo.age}</option>-->
+                <!--</volist>-->
+            <!--</select>-->
+            <!--<input type="text" name="" id="age" value="" class="input_text" placeholder="7～35月龄" />-->
+            <!--<img src="__TMPL__/public/mobile/images/youjiantou.png" class="jiantou" />-->
         </div>
         </div>
-    </div>
-    <div class="input_num">
-        <p>宝宝年龄</p>
-        <input type="text" name="baby_age" id="age" value="" readonly class="input_text" placeholder="请选择宝宝年龄" />
-        <img src="__TMPL__/public/mobile/images/youjiantou.png" class="jiantou" />
-        <!--<select name="baby_age" class="input_text">-->
-            <!--<volist name="babyList" id="vo">-->
-                <!--<option value="{$vo.id}">{$vo.age}</option>-->
-            <!--</volist>-->
-        <!--</select>-->
-        <!--<input type="text" name="" id="age" value="" class="input_text" placeholder="7～35月龄" />-->
-        <!--<img src="__TMPL__/public/mobile/images/youjiantou.png" class="jiantou" />-->
-    </div>
-
-    <div class="btn">
-        确定
-    </div>
 
 
-    <div class="bottom_icon">
-        <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
-        <p class="bottom_text">{$site_info.site_name}</p>
+        <div class="btn">
+            确定
+        </div>
     </div>
     </div>
 </div>
 </div>
+<div class="bottom_icon">
+    <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
+    <p class="bottom_text">{$site_info.site_name}</p>
+</div>
 <script src="__TMPL__/public/mobile/js/jquery-2.1.0.js" type="text/javascript" charset="utf-8"></script>
 <script src="__TMPL__/public/mobile/js/jquery-2.1.0.js" type="text/javascript" charset="utf-8"></script>
 <script src="__TMPL__/public/mobile/js/weui.js" type="text/javascript" charset="utf-8"></script>
 <script src="__TMPL__/public/mobile/js/weui.js" type="text/javascript" charset="utf-8"></script>
 <script src="__TMPL__/public/mobile/js/myweui.js" type="text/javascript" charset="utf-8"></script>
 <script src="__TMPL__/public/mobile/js/myweui.js" type="text/javascript" charset="utf-8"></script>