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

Fixed bugs at 2017/06/13 13:21

Browse Source
This commit is contained in:
catsworld
2017-06-13 14:13:27 +08:00
parent fdbfcb7ba1
commit e8a864978d
13 changed files with 106 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/css/bootstrap.min.css
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
public/css/main.css
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ a:hover, a:focus {
position: absolute;
top: 0;
left: 0;
height: 157px;
height: 138px;
width: 100%;
z-index: -2;
overflow: hidden;
@@ -20,7 +20,7 @@ a:hover, a:focus {
top: -10px;
left: -20px;
padding: 0 20px;
height: 157px;
height: 138px;
width: 100%;
box-sizing: content-box;
}
public/js/good/editfav.js
+2 -2
View File
@@ -7,14 +7,14 @@ $(".good").mouseleave(function(){
$("img",this).css("filter","brightness(100%)");
});
function editfav(){
$(".cb").attr("style","visibility:show;width:30px;height:30px;");
$(".cb").attr("style","visibility:show;width:25px;height:25px;z-index:203;position:absolute;top:0;left:5px");
$(".cb").removeAttr("checked");
$("#editbutton").attr("onclick","back()");
$("#editbutton").text("返回");
$("#del_submit").show();
}
function back(){
$(".cb").attr("style","visibility:hidden;width:30px;height:30px;");
$(".cb").attr("style","visibility:hidden;width:25px;height:25px;z-index:203");
$("#editbutton").attr("checked",'true');
$("#editbutton").text("编辑收藏夹");
$("#editbutton").attr("onclick","editfav()");
resources/views/good/goodInfo.blade.php
+1 -1
View File
@@ -65,7 +65,7 @@
</div>
</form>
@endif
@if($good->user_id == Session::get('user_id') || Session::get('is_admin') >= 1)
@if($good->user_id == Session::get('user_id') || Session::get('is_admin') == 2)
<form action="/good/{{ $good->id }}/edit" style="display:inline-block;">
<input type="submit" class="btn btn-primary" value="修改">
</form>
resources/views/good/goodInfoOnWelcome.blade.php
+5 -6
View File
@@ -3,9 +3,12 @@
<a href="/good/{{ $good->id }}">
<div class="panel panel-default">
<div class="panel-heading">
<div style="position:absolute;z-index:201">
<input type="checkBox" name="del_goods[]" value="0" id="box{{ $good->good_id }}" class="cb" onclick="{setValue({{ $good->good_id }})}" style="visibility:hidden;width:20%;z-index:203" />
</div>
<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-xs" style="position:absolute;z-index:200;top:-40px;left:5px;color:white;font-size:12px;">
<div class="det-d hidden-xs" style="position:absolute;z-index:200;top:-42px;left:5px;color:white;font-size:12px;">
售价：￥{{ $good->price }}<br/>
@if($good->count==0)
无库存QAQ
@@ -13,7 +16,7 @@
库存：{{ $good->count }}
@endif
</div>
<div class="det-d visible-xs-block" style="position:absolute;z-index:200;top:-40px;left:5px;color:white;font-size:15px;">
<div class="det-d visible-xs-block" style="position:absolute;z-index:200;top:-42px;left:5px;color:white;font-size:15px;">
售价：￥{{ $good->price }}<br/>
@if($good->count==0)
无库存QAQ
@@ -21,10 +24,6 @@
库存：{{ $good->count }}
@endif
</div>
<div style="position:absolute;z-index:201;right:0%;top:0%;">
<input type="checkBox" name="del_goods[]" value="0" id="box{{ $good->good_id }}"
class="cb" onclick="{setValue({{ $good->good_id }})}" style="visibility:hidden;width:5%;z-index:203;position: absolute;" />
</div>
</div>
</div>
<div class="panel-body">
resources/views/layout/footer.blade.php
+5 -6
View File
@@ -17,14 +17,13 @@
</div>
</footer>
@if( env('APP_DEBUG') )
<footer class="row">
<div class="small-11 small-centered columns">
<div class="footer">
<div class="container">
<span>
<center>
当前处于调试模式<br> 程序版本：{{ config('app.version') }}&nbsp;&nbsp; 文件版本：<a
href="https://github.com/NEUP-Net-Depart/NEUP-FleaMarket/commit/{{ explode(' ', exec('git log --pretty=oneline -1'))[0] }}">{{ exec('git log --abbrev-commit --pretty=oneline -1') }}</a>
当前处于调试模式<br> 程序版本：{{ config('app.version') }}&nbsp;&nbsp; 文件版本：<a href="https://github.com/NEUP-Net-Depart/NEUP-FleaMarket/commit/{{ explode(' ', exec('git log --pretty=oneline -1'))[0] }}">{{ exec('git log --abbrev-commit --pretty=oneline -1') }}</a>
</center>
</span>
</div>
</footer>
</div>
</div>
@endif
resources/views/layout/header.blade.php
+3 -3
View File
@@ -18,13 +18,13 @@
@if(Session::has('user_id'))
<li class="dropdown">
<a class="navbar-avatar dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<img src="/avatar/{{ Session::get('user_id') }}/62/62" class="avatar"/>
<img src="/avatar/{{ Session::get('user_id') }}/50/50" class="avatar"/>
</a>
<ul class="dropdown-menu">
<li><a href="/user">个人中心</a></li>
<li><a href="/user/fav">收藏夹</a></li>
<li><a href="/user/trans">我的订单</a></li>
<li><a href="/user/sell">我的商品</a></li>
<li><a href="/user/trans">我的购买</a></li>
<li><a href="/user/sell">我的出售</a></li>
@if(Session::get('is_admin') >= 1)
<li><a href="/admin">管理中心</a></li>
@endif
resources/views/user/editUserAccount.blade.php
+1 -1
View File
@@ -55,6 +55,6 @@
<label for="newPassword_confirmation">确认新密码</label>
<input type="password" name="newPassword_confirmation" id="newPassword_confirmation" class="form-control" placeholder="必填" required>
</div>
<input type="submit" class="btn btn-primary" value="保存">
<input type="submit" class="btn btn-primary" name="password_submit" value="保存">
</form>
</div>
resources/views/user/favlist.blade.php
+2 -1
View File
@@ -14,11 +14,12 @@
{!! csrf_field() !!}
{!! method_field('DELETE') !!}
@foreach($goods as $good)
<?php $good = $good_info[$good->good_id] ?>
@include('good.goodInfoOnWelcome')
@endforeach
</div>
<div class="col-sm-3">
<button type="button" class="btn btn-primary" onclick="editfav()" id="editbutton">编辑收藏夹</button>
<a href="#" type="button" class="btn btn-primary" onclick="editfav()" id="editbutton">编辑收藏夹</a>
<input type="button" id="del_submit" class="btn btn-primary" value="删除选中商品" style="display: none" onclick="submitdel()" />
</div>
</form>
resources/views/user/seller/master.blade.php
+56
View File
@@ -0,0 +1,56 @@
@extends('layout.master')
@section('title', "我的出售")
@section('asset')
<style>
h5 {
color: #ffffff;
}
.trans_msg {
filter: alpha(opacity=100) revealTrans(duration=.2, transition=1) blendtrans(duration=.2);
width: 400px;
height: 200px;
}
</style>
@endsection
@section('content')
<h3>我的出售</h3>
<ul class="nav nav-tabs" role="tablist">
@yield('tab-list')
</ul>
<div class="panel panel-default">
<div class="tab-content panel-body">
@yield('tab-content')
</div>
</div>
<script src="/js/good/ToolTip.js"></script>
<script>
function del_good(goodid) {
if (confirm('确定删除吗？')) {
var str_data1 = $('#delform').serialize();
var str_data = str_data1 + '&_method=DELETE';
$.ajax({
type: "POST",
url: "/good/" + goodid + "/delete",
data: str_data,
success: function (msg) {
$('#good' + goodid).slideUp();
}
});
}
}
$(document).ready(function () {
$("a[href='#trans']").click(function () {
window.location.href = "/user/sell/trans";
});
$("a[href='#tickets']").click(function () {
window.location.href = "/user/sell/tickets";
});
});
</script>
@endsection
resources/views/user/seller/mygoods.blade.php
+8 -54
View File
@@ -1,31 +1,12 @@
@extends('layout.master')
@extends('user.seller.master')
@section('title', "我的出售")
@section('asset')
<style>
h5 {
color: #ffffff;
}
.trans_msg {
filter: alpha(opacity=100) revealTrans(duration=.2, transition=1) blendtrans(duration=.2);
width: 400px;
height: 200px;
}
</style>
@section('tab-list')
<li role="presentation" class="active"><a href="/user/sell">我的商品</a></li>
<li role="presentation"><a href="/user/sell/trans">交易订单</a></li>
<li role="presentation"><a href="/user/sell/tickets">历史评价</a></li>
@endsection
@section('content')
<h3>我的出售</h3>
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#goods" aria-controls="goods" role="tab" data-toggle="tab">我的商品</a></li>
<li role="presentation"><a href="#trans" aria-controls="trans" role="tab" data-toggle="tab">交易订单</a></li>
<li role="presentation"><a href="#tickets" aria-controls="tickets" role="tab" data-toggle="tab">历史评价</a></li>
</ul>
<div class="panel panel-default">
<div class="tab-content panel-body">
@section('tab-content')
<div role="tabpanel" class="tab-pane active" id="goods">
<table class="table table-hover">
<tr>
@@ -61,35 +42,8 @@
{{ $goods->links() }}
</table>
</div>
<div class="tab-pane" id="trans">
<div role="tabpanel" class="tab-pane" id="trans">
</div>
<div class="tab-pane" id="tickets">
<div role="tabpanel" class="tab-pane" id="tickets">
</div>
</div>
<script src="/js/good/ToolTip.js"></script>
<script>
function del_good(goodid) {
if (confirm('确定删除吗？')) {
var str_data1 = $('#delform').serialize();
var str_data = str_data1 + '&_method=DELETE';
$.ajax({
type: "POST",
url: "/good/" + goodid + "/delete",
data: str_data,
success: function (msg) {
$('#good' + goodid).slideUp();
}
});
}
}
$(document).ready(function () {
$("a[href='#trans']").click(function () {
window.location.href = "/user/sell/trans";
});
$("a[href='#tickets']").click(function () {
window.location.href = "/user/sell/tickets";
});
});
</script>
@endsection
resources/views/user/seller/sellerTrans.blade.php
+9 -40
View File
@@ -1,47 +1,16 @@
@extends('layout.master')
@extends('user.seller.master')
@section('title', "我的出售")
@section('asset')
<style>
h5 {
color: #ffffff;
}
.trans_msg {
filter: alpha(opacity=100) revealTrans(duration=.2, transition=1) blendtrans(duration=.2);
width: 400px;
height: 200px;
}
</style>
@section('tab-list')
<li role="presentation"><a href="/user/sell">我的商品</a></li>
<li role="presentation" class="active"><a href="/user/sell/trans">交易订单</a></li>
<li role="presentation"><a href="/user/sell/tickets">历史评价</a></li>
@endsection
@section('content')
<h3>我的出售</h3>
<ul class="tabs" data-tabs id="editinfo">
<li class="tabs-title"><a href="#goods" aria-selected="true">我的商品</a></li>
<li class="tabs-title is-active"><a href="#trans">交易订单</a></li>
<li class="tabs-title"><a href="#tickets">历史评价</a></li>
</ul>
<div class="tabs-content" data-tabs-content="editinfo">
<div class="tabs-panel" id="goods">
@section('tab-content')
<div role="tabpanel" class="tab-pane" id="goods">
</div>
<div class="tabs-panel" id="trans">
<div role="tabpanel" class="tab-pane" id="trans">
</div>
<div class="tabs-panel" id="tickets">
<div role="tabpanel" class="tab-pane active" id="tickets">
</div>
</div>
<script src="/js/good/ToolTip.js"></script>
<script>
$(document).ready(function () {
$("a[href='#goods']").click(function () {
window.location.href = "/user/sell";
});
$("a[href='#tickets']").click(function () {
window.location.href = "/user/sell/tickets";
});
});
</script>
@endsection
resources/views/user/seller/tickets.blade.php
+9 -54
View File
@@ -1,61 +1,16 @@
@extends('layout.master')
@extends('user.seller.master')
@section('title', "我的出售")
@section('asset')
<style>
h5 {
color: #ffffff;
}
.trans_msg {
filter: alpha(opacity=100) revealTrans(duration=.2, transition=1) blendtrans(duration=.2);
width: 400px;
height: 200px;
}
</style>
@section('tab-list')
<li role="presentation"><a href="/user/sell">我的商品</a></li>
<li role="presentation"><a href="/user/sell/trans">交易订单</a></li>
<li role="presentation" class="active"><a href="/user/sell/tickets">历史评价</a></li>
@endsection
@section('content')
<h3>我的出售</h3>
<ul class="tabs" data-tabs id="editinfo">
<li class="tabs-title"><a href="#goods" aria-selected="true">我的商品</a></li>
<li class="tabs-title"><a href="#trans">交易订单</a></li>
<li class="tabs-title is-active"><a href="#tickets">历史评价</a></li>
</ul>
<div class="tabs-content" data-tabs-content="editinfo">
<div class="tabs-panel" id="goods">
@section('tab-content')
<div role="tabpanel" class="tab-pane" id="goods">
</div>
<div class="tabs-panel" id="trans">
<div role="tabpanel" class="tab-pane" id="trans">
</div>
<div class="tabs-panel" id="tickets">
<div role="tabpanel" class="tab-pane" id="tickets">
</div>
</div>
<script src="/js/good/ToolTip.js"></script>
<script>
function del_good(goodid) {
if (confirm('确定删除吗？')) {
var str_data1 = $('#delform').serialize();
var str_data = str_data1 + '&_method=DELETE';
$.ajax({
type: "POST",
url: "/good/" + goodid + "/delete",
data: str_data,
success: function (msg) {
$('#good' + goodid).slideUp();
}
});
}
}
$(document).ready(function () {
$("a[href='#goods']").click(function () {
window.location.href = "/user/sell";
});
$("a[href='#trans']").click(function () {
window.location.href = "/user/sell/trans";
});
});
</script>
@endsection