iFish/Light12306
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merger

Browse Source
This commit is contained in:
SilenceLeo 2014-09-05 14:59:50 +08:00
commit 3a2fe5c837
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mobile12306New/css/css.css
View File

@ -120,10 +120,8 @@ input[type=radio]:checked:after{content:''; display:block; width:12px; height:12
.form_label{display:inline-block; width:86px; float:left;}
.ipt_wrap{position:relative; overflow:hidden;}
.ipt_wrap .ipt{position:relative; width:100%; padding:10px 0; height:20px; border:0; margin:0;}
.form_cardimg{float:right; width:90px; height:40px; overflow:hidden; margin:0 0 0 10px; text-align:center; vertical-align:middle;}
.form_cardimg img{max-width:100%; height:100%;}
/*#query_form .btn_success{width:60%;}
#query_form .btn_gray{width:35%;}*/
.form_cardimg{float:right; width:90px; overflow:hidden; margin:7px 0 0 10px; text-align:center; vertical-align:middle;}
.form_cardimg img{max-width:100%;}
.btn{ height:40px; padding:0 1em;-webkit-box-sizing: border-box; line-height:40px; background:#ffbb51; border:0; margin:0; display:inline-block; border-radius:3px; font-size:1.1875rem; color:#FFF; text-align:center; position:relative; overflow:hidden;}
.btn_block{display:block; width:100%; }
@ -256,6 +254,7 @@ input[type=radio]:checked:after{content:''; display:block; width:12px; height:12
.link_list:before{content:''; border:solid; border-color:transparent transparent #f4f4f4 transparent; border-width:0 8px 8px 8px; position:absolute; top:-8px; right:19px;}
.link_list li{border-bottom:#cacaca solid 1px;}
.link_list li:last-child{border-bottom:0;}
.link_list .form_label{float:none;}
.link_list a{display:block; text-align:center; font-size:1.0625rem; color:#787878; line-height:2.647058823529412em;}
.link_list a:active{background: rgba(150,150,150,.1)}

5
Mobile12306New/index.html
View File

@ -41,14 +41,9 @@
<label><input type="radio" value="1" checked="checked" name="type">普通票</label>
<label><input type="radio" value="2" name="type">学生票</label>
</div>
<<<<<<< HEAD
<div class="form_line"><a href="javascript:;" class="block text_center" id="open_filter"><span class="pull_right"><i class="icon_right"></i></span>选择条件：类型/席别/时段/车次</a></div>
=======
<div class="form_line"><a href="javascript:;" class="block text_center" id="open_filter"><span class="pull_right"><i class="icon_right"></i></span>类别/坐席/车次/联系人</a></div>
>>>>>>> 02f84c66d2fc321e999eace2b8bb58e803438ddd
<div class="form_btns">
<input type="hidden" name="filters" value="">
<button type="button" class="btn btn_gray btn_block btn_lg pull_right">查学生票</button>
<button type="submit" id="btnLogin" class="btn btn_success btn_block btn_lg">查询</button>
</div>
</form>

2
Mobile12306New/js/query.js
View File

@ -42,11 +42,9 @@ var Query = {
$('#query_form').on('submit', function() {
var start = $('#startStationCode').val(),
end = $('#endStationCode').val();
if (start == '') {
Public.alert('请选择出发站');
return false;