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

No! Bug! No! Life

Browse Source
This commit is contained in:
catsworld
2017-06-14 19:40:45 +08:00
parent ec92361fbc
commit ecb7483af4
12 changed files with 53 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/css/main.css
Vendored
+2 -7
View File
@@ -6,7 +6,7 @@ a:hover, a:focus {
position: absolute;
top: 0;
left: 0;
height: 152px;
height: 135px;
width: 100%;
z-index: -2;
overflow: hidden;
@@ -20,7 +20,7 @@ a:hover, a:focus {
top: -10px;
left: -20px;
padding: 0 20px;
height: 152px;
height: 135px;
width: 100%;
box-sizing: content-box;
}
@@ -87,11 +87,6 @@ a:hover, a:focus {
border-radius: 50%;
}
.navbar-search {
padding: 0;
margin: 0;
}
#searchq {
border: 0px;
}
public/js/good/goodedit.js
+1 -1
View File
@@ -18,7 +18,7 @@ function preview(file) {
var reader = new FileReader();
reader.onload = function (evt) {
prevDiv.innerHTML = '<img id="goodimgpreview" src="' + evt.target.result + '" />';
$jQuery_FOUNDATION('#goodimgpreview').cropper({
$('#goodimgpreview').cropper({
aspectRatio: 16 / 9,
crop: function (e) {
$("#goodTitleUploadCpX").val(e.x);
public/js/jquery-3.2.1.min.js
Vendored
+4
View File
File diff suppressed because one or more lines are too long
public/js/jquery.min.js
Vendored
-4
View File
File diff suppressed because one or more lines are too long
public/js/main.js
+1 -1
View File
@@ -1,5 +1,5 @@
$(document).ready(function() {
$jQuery_CROPPER.fn.cropper();
$.fn.cropper();
});
var pngMagic = [
public/js/popper.min.js
Vendored
+3
View File
File diff suppressed because one or more lines are too long
public/js/tether.min.js
Vendored
+1
View File
File diff suppressed because one or more lines are too long
resources/views/good/goodInfo.blade.php
+18 -32
View File
@@ -12,45 +12,31 @@
@endsection
@section('content')
<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
<script type="text/javascript">
var $jQuery_NEW = $.noConflict(true);
</script>
<!--Pop new version of jQuery and 向黑恶势力低头-->
<script src="https://cdn.bootcss.com/jquery/1.3.1/jquery.min.js"></script>
<script src="/js/good/imgbox/jquery.imgbox.pack.js"></script>
<script type="text/javascript">
$(document).ready(function () {
if ($(document.body).width() > 640) {
$("#pic").imgbox({
'speedIn': 0,
'speedOut': 0,
'alignment': 'center',
'overlayShow': true,
'allowMultiple': false
});
}
});
<script>
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
</script>
<div class="row">
<div class="col-12 col-md-5">
<a id="pic" href="/good/{{ sha1($good->id) }}/titlepic"><img class="card" src="/good/{{ sha1($good->id) }}/titlepic" style="width:100%"/></a><br/>
</div>
<div class="col-12 col-md-6 offset-md-1">
<h2 style="word-break:break-all">{{ $good->good_name }}@if($good->baned)【已封禁】@endif
<span class="hidden-sm-down">
<div class="col-12 col-md-7">
<div>
<span class="hidden-sm-down" style="position:relative;top:-8px">
@if(isset($inFvlst))
@if(count($inFvlst) == 0)
<button class="fa fa-star-o btn btn-primary" onclick="add_favlist()" title="收藏OvO"></button>
<button class="fa fa-star-o btn btn-primary" onclick="add_favlist()" data-toggle="tooltip" data-placement="top" title="收藏OvO"></button>
@endif
@if(count($inFvlst) != 0)
<button class="fa fa-star btn btn-primary" onclick="del_favlist()" title="取消收藏QAQ"></button>
<button class="fa fa-star btn btn-primary" onclick="del_favlist()" data-toggle="tooltip" data-placement="top" title="取消收藏QAQ"></button>
@endif
@else
<button class="fa fa-star-o btn btn-primary" onclick="window.location.href='/login'" title="收藏OvO"></button>
<button class="fa fa-star-o btn btn-primary" onclick="window.location.href='/login'" data-toggle="tooltip" data-placement="top" title="收藏OvO"></button>
@endif
</span>
</h2>
<h2 style="margin-left:10px;display:inline-block;word-break:break-all">{{ $good->good_name }}@if($good->baned)【已封禁】@endif</h2>
</div>
卖家：<a href="/user/{{ $user->id }}">{{ $user->nickname }}@if($user->baned)【已封禁】@endif</a> &nbsp; <a href="/message/startConversation/{{ $user->id }}">和我联系</a>
<div><!-- 放tag 和更多图片缩略图 --></div>
<div>售价：<h3 style="display:inline-block"><b class="text-warning">￥{{ $good->price }}</b></h3></div>
@@ -105,9 +91,9 @@
url: "/good/{{ $good->id }}/add_favlist",
data: str_data,
success: function (msg) {
$jQuery_NEW('.fa-star-o').attr('title','取消收藏QAQ');
$jQuery_NEW('.fa-star-o').attr('onclick', 'del_favlist()');
$jQuery_NEW('.fa-star-o').attr('class','fa fa-star btn btn-primary');
$('.fa-star-o').attr('title','取消收藏QAQ');
$('.fa-star-o').attr('onclick', 'del_favlist()');
$('.fa-star-o').attr('class','fa fa-star btn btn-primary');
}
});
}
@@ -121,9 +107,9 @@
url: "/good/{{ $good->id }}/del_favlist",
data: str_data,
success: function (msg) {
$jQuery_NEW('.fa-star').attr('title','收藏OvO');
$jQuery_NEW('.fa-star').attr('onclick', 'add_favlist()');
$jQuery_NEW('.fa-star').attr('class','fa fa-star-o btn btn-primary');
$('.fa-star').attr('title','收藏OvO');
$('.fa-star').attr('onclick', 'add_favlist()');
$('.fa-star').attr('class','fa fa-star-o btn btn-primary');
}
});
}
resources/views/good/goodInfoForm.blade.php
+1 -1
View File
@@ -98,7 +98,7 @@
var reader = new FileReader();
reader.onload = function (evt) {
prevDiv.innerHTML = '<br/><img id="goodimgpreview" src="' + evt.target.result + '" />';
$jQuery_CROPPER('#goodimgpreview').cropper({
$('#goodimgpreview').cropper({
aspectRatio: 16 / 9,
crop: function (e) {
$("#goodTitleUploadCpX").val(e.x);
resources/views/layout/header.blade.php
+15 -10
View File
@@ -1,9 +1,8 @@
<nav class="navbar navbar-toggleable-md navbar-inverse">
<nav class="navbar navbar-toggleable-sm navbar-inverse">
<div class="navbar-back">
<div class="navbar-bg"></div>
<div class="navbar-filter"></div>
</div>
<div class="container">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -41,21 +40,27 @@
@endif
</ul>
</div>
</div>
</nav>
<div class="banner-back"><div class="banner"></div></div>
<div class="container">
<br/>
<div class="col-lg-12 navbar-search float-right">
<div class="hidden-sm-down col-12">
<form action="/good" method="GET">
<div class="input-group">
<input type="text" class="form-control" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="@if(isset($_GET['query'])){{urldecode($_GET['query'])}}@endif"/>
<div class="input-group float-right" style="width:250px">
<input type="text" class="form-control" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="@if(isset($_GET['query'])){{urldecode($_GET['query'])}}@endif" style="width:300px">
<span class="input-group-btn">
<input type="submit" class="btn btn-primary" value="G♂"/>
<input type="submit" class="btn btn-primary" value="G♂">
</span>
</div>
</form>
</div>
</div>
<div class="hidden-md-up col-12">
<form action="/good" method="GET">
<div class="input-group float-right">
<input type="text" class="form-control" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="@if(isset($_GET['query'])){{urldecode($_GET['query'])}}@endif" style="width:300px">
<span class="input-group-btn">
<input type="submit" class="btn btn-primary" value="G♂">
</span>
</div>
</form>
</div>
resources/views/layout/master.blade.php
+6 -9
View File
@@ -4,20 +4,17 @@
<meta charset="utf-8">
<meta http-equiv="x-UA-compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/font-awesome.min.css">
<link rel="stylesheet" href="/css/main.css">
<link rel="stylesheet" href="/css/cropper.min.css">
<script src="/js/jquery.min.js"></script>
<script src="/js/jquery-3.2.1.min.js"></script>
<script src="/js/tether.min.js"></script>
<script src="/js/cropper.min.js"></script>
@yield('asset')
<!--Pop foundation and cropper's old version jQuery-->
<script type="text/javascript">
var $jQuery_CROPPER = $.noConflict(true);
</script>
<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
<script src="/js/jquery.slides.min.js"></script>
<script src="/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
<script src="/js/popper.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
@yield('asset')
<title>@yield('title') - 先锋市场 Powered by NEUPioneer</title>
</head>
<body>
resources/views/user/editUserExtra.blade.php
+1 -1
View File
@@ -36,7 +36,7 @@
var reader = new FileReader();
reader.onload = function (evt) {
prevDiv.innerHTML = '<img id="avatarpreview" src="' + evt.target.result + '" />';
$jQuery_CROPPER('#avatarpreview').cropper({
$('#avatarpreview').cropper({
aspectRatio: 1 / 1,
crop: function (e) {
$('#avatarUploadCpX').val(e.x);