c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复筛选栏、det等锅

Browse Source
This commit is contained in:
iborvs
2017-06-18 18:03:25 +08:00
parent ab98b91a28
commit 771be0d155
5 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/css/goodlist.css
Vendored
+3
View File
@@ -78,6 +78,9 @@
margin-left:10px;
margin-right:10px;
}
#ds{
margin-top: 5px;
}
}
@media (max-width: 507px){
.ad{
public/js/good/good_list.js
+4 -4
View File
@@ -1,13 +1,13 @@
$(document).ready(function(){
switch ($("#nm").prop("className")){
case "p":
$("#nm").text('按价格从低到高');break;
$("#sort").text('按价格从低到高');break;
case "pd":
$("#nm").text("按价格从高到低");break;
$("#sort").text("按价格从高到低");break;
case "c":
$("#nm").text("按库存从少到多");break;
$("#sort").text("按库存从少到多");break;
case "cd":
$("#nm").text("按库存从多到少");break;
$("#sort").text("按库存从多到少");break;
}
});
resources/views/good/goodInfoOnWelcome.blade.php
+12 -3
View File
@@ -9,12 +9,13 @@
<img src="/good/{{ sha1($good->id) }}/titlepic" class="titlepic"/>
<div class="details" style="position:absolute;z-index:200;width:100%;display:none;">
<div class="det-d hidden-sm-down" style="position:absolute;z-index:200;top:-37px;left:5px;color:white;font-size:12px;">
<p>售价：￥{{ $good->price }}</p>
<p>@if($good->count==0)
售价：￥{{ $good->price }}
<p> @if($good->count==0)
无库存QAQ
@else
库存：{{ $good->count }}
@endif</p>
@endif
</p>
</div>
<div class="det-d hidden-md-up" style="position:absolute;z-index:200;top:-43px;left:5px;color:white;font-size:15px;">
<p>售价：￥{{ $good->price }}</p>
@@ -28,6 +29,14 @@
</div>
<div class="card-block" style="word-break:break-all">
{{ $good->good_name }}
<div class="hidden-md-up" style="font-size: 13px;color:black">
<p class="text-warning" style="margin-bottom: 0">售价：￥{{ $good->price }}</p>
<p style="margin-bottom: 0">@if($good->count==0)
无库存QAQ
@else
库存：{{ $good->count }}
@endif</p>
</div>
</div>
</div>
</a>
resources/views/good/goodList.blade.php
+9 -10
View File
@@ -9,14 +9,13 @@
@section('content')
<div class="row">
@include('layout.catlist')
<div class="hidden-md-up">&nbsp;</div>
<div class="col-12 col-md-10">
<p>
<div class="row">
<div class="col-12 col-md-2">
<div class="col-12 col-md-3">
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" id="sort" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<input type="hidden" id="nm" class="@if(isset($_GET['sort'])){{ $_GET['sort'] }}@endif">
<input type="hidden" id="nm" class="@if(isset($_GET['sort'])){{ $_GET['sort'] }}@endif" />
排序
</button>
<div class="dropdown-menu" aria-labelledby="sort">
@@ -28,11 +27,11 @@
</div>
</div>
</div>
<div class="col-12 col-lg-5">
<a>价格筛选</a> <input id="priceSet1" style="display:inline-block"maxlength="9" class="form-control" value="@if(isset($_GET['start_price'])){{ $_GET['start_price'] }}@endif"/> - <input id="priceSet2" class="form-control" style="display:inline-block" maxlength="9" value="@if(isset($_GET['end_price'])){{ $_GET['end_price'] }}@endif"/>&nbsp;<button class="btn btn-primary" onclick="setc('a')">确定</button>
<div class="col-12 col-lg-5" id="ds">
<a>价格筛选</a> <input id="priceSet1" style="display:inline-block"maxlength="9" class="form-control" value="@if(isset($_GET['start_price'])){{ $_GET['start_price'] }}@endif"/> - <input id="priceSet2" class="form-control" style="display:inline-block" maxlength="9" value="@if(isset($_GET['end_price'])){{ $_GET['end_price'] }}@endif"/><button class="btn btn-primary" onclick="setc('a')">确定</button>
</div>
<div class="col-12 col-lg-5">
<a>库存下限</a> <input id="pricec" style="display:inline-block" maxlength="9" class="form-control" value="@if(isset($_GET['start_count'])){{ $_GET['start_count'] }}@endif"/>&nbsp;<button class="btn btn-primary" id="subs" onclick="setc('a')">确定</button>
<div class="col-12 col-lg-5" style="display:none">
<a>库存下限</a> <input id="pricec" style="display:inline-block" maxlength="9" class="form-control" value="@if(isset($_GET['start_count'])){{ $_GET['start_count'] }}@endif"/><button class="btn btn-primary" id="subs" onclick="setc('a')">确定</button>
</div>
</div>
</p>
@@ -47,11 +46,11 @@
</div>
<div class="card-block">
<div style="word-break:break-all">{{ $good->good_name }}</div>
<div class="text-warning"><b>￥{{ $good->price }}</b></div>
<div class="text-warning" style="font-size: 13px"><b>￥{{ $good->price }}</b></div>
@if($good->count==0)
<div class="text-danger">无库存QAQ</div>
<div class="text-danger" style="font-size: 13px;color: black">无库存QAQ</div>
@else
<div>库存：{{ $good->count }}</div>
<div style="font-size: 13px;color: black">库存：{{ $good->count }}</div>
@endif
</div>
</div>
resources/views/layout/catlist.blade.php
+1 -1
View File
@@ -1,6 +1,6 @@
<div class="col-md-2 hidden-sm-down" style="position:sticky;top:0;left:0">
<ul class="nav nav-pills flex-column">
<li class="nav-item"><a href="/good" class="nav-link @if(isset($cat_id)&&$cat_id == 0) active @endif" style="white-space:nowrap;overflow:hidden">所有商品</a></li>
<li class="nav-item"><a href="/good" class="nav-link @if(isset($cat_id)&&$cat_id == 0) active @endif" style="white-space:nowrap;overflow:hidden" data-toggle="tooltip">所有商品</a></li>
@foreach($cats as $cat)
<li class="nav-item"><a href="/good?cat_id={{ $cat->id }}" class="nav-link @if(isset($cat_id)&&$cat_id == $cat->id) active @endif" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ $cat->cat_name }}</a></li>
@endforeach