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

changes

Browse Source
This commit is contained in:
iborvs
2017-06-15 16:38:50 +08:00
parent 1af7000f0e
commit d0befe29c6
3 changed files with 100 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+37 -37
View File
@@ -125,7 +125,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
"url": "https://files.phpcomposer.com/files/ezyang/htmlpurifier/d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2.zip",
"reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
"shasum": ""
},
@@ -483,16 +483,16 @@
},
{
"name": "laravel/framework",
"version": "v5.4.25",
"version": "v5.4.26",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "6bcc9b1f542b3deed16d51f6aa1fe318ab407c2a"
"reference": "a7ebbfab64111e24f8e584db64e2be9279ded357"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/6bcc9b1f542b3deed16d51f6aa1fe318ab407c2a",
"reference": "6bcc9b1f542b3deed16d51f6aa1fe318ab407c2a",
"url": "https://files.phpcomposer.com/files/laravel/framework/a7ebbfab64111e24f8e584db64e2be9279ded357.zip",
"reference": "a7ebbfab64111e24f8e584db64e2be9279ded357",
"shasum": ""
},
"require": {
@@ -608,7 +608,7 @@
"framework",
"laravel"
],
"time": "2017-06-07T13:35:12+00:00"
"time": "2017-06-13T18:58:49+00:00"
},
{
"name": "league/flysystem",
@@ -703,7 +703,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mewebstudio/Purifier/zipball/e7cb532acbb9f5aaed4d62fe21fe387c8abf18db",
"url": "https://files.phpcomposer.com/files/mewebstudio/Purifier/e7cb532acbb9f5aaed4d62fe21fe387c8abf18db.zip",
"reference": "e7cb532acbb9f5aaed4d62fe21fe387c8abf18db",
"shasum": ""
},
@@ -1809,16 +1809,16 @@
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.3.0",
"version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
"reference": "f29dca382a6485c3cbe6379f0c61230167681937"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
"reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
"url": "https://files.phpcomposer.com/files/symfony/polyfill-mbstring/f29dca382a6485c3cbe6379f0c61230167681937.zip",
"reference": "f29dca382a6485c3cbe6379f0c61230167681937",
"shasum": ""
},
"require": {
@@ -1830,7 +1830,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3-dev"
"dev-master": "1.4-dev"
}
},
"autoload": {
@@ -1864,7 +1864,7 @@
"portable",
"shim"
],
"time": "2016-11-14T01:06:16+00:00"
"time": "2017-06-09T14:24:12+00:00"
},
{
"name": "symfony/process",
@@ -2393,7 +2393,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
"url": "https://packagist.phpcomposer.com/files/fzaninotto/Faker/44f9a286a04b80c76a4e5fb7aad8bb539b920123.zip",
"reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
"shasum": ""
},
@@ -2486,7 +2486,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/6fdb61243844dc924071d3404bb23994ea0b6856",
"url": "https://files.phpcomposer.com/files/padraic/mockery/6fdb61243844dc924071d3404bb23994ea0b6856.zip",
"reference": "6fdb61243844dc924071d3404bb23994ea0b6856",
"shasum": ""
},
@@ -2551,7 +2551,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
"url": "https://files.phpcomposer.com/files/myclabs/DeepCopy/8e6e04167378abf1ddb4d3522d8755c5fd90d102.zip",
"reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
"shasum": ""
},
@@ -2593,7 +2593,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
"url": "https://packagist.phpcomposer.com/files/phpDocumentor/ReflectionCommon/144c307535e82c8fdcaacbcfc1d6d8eeb896687c.zip",
"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
"shasum": ""
},
@@ -2647,7 +2647,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
"url": "https://packagist.phpcomposer.com/files/phpDocumentor/ReflectionDocBlock/8331b5efe816ae05461b7ca1e721c01b46bafb3e.zip",
"reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
"shasum": ""
},
@@ -2692,7 +2692,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
"url": "https://packagist.phpcomposer.com/files/phpDocumentor/TypeResolver/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb.zip",
"reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
"shasum": ""
},
@@ -2739,7 +2739,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
"url": "https://files.phpcomposer.com/files/phpspec/prophecy/93d39f1f7f9326d746203c7c056f300f7f126073.zip",
"reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
"shasum": ""
},
@@ -2802,7 +2802,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/php-code-coverage/ef7b2f56815df854e66ceaee8ebe9393ae36a40d.zip",
"reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
"shasum": ""
},
@@ -2865,7 +2865,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
"url": "https://packagist.phpcomposer.com/files/sebastianbergmann/php-file-iterator/3cc8f69b3028d0f96a9078e6295d86e9bf019be5.zip",
"reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
"shasum": ""
},
@@ -2953,7 +2953,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/php-timer/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f.zip",
"reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
"shasum": ""
},
@@ -3002,7 +3002,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/php-token-stream/e03f8f67534427a787e21a385a67ec3ca6978ea7.zip",
"reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
"shasum": ""
},
@@ -3051,7 +3051,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3cb94a5f8c07a03c8b7527ed7468a2926203f58b",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/phpunit/3cb94a5f8c07a03c8b7527ed7468a2926203f58b.zip",
"reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b",
"shasum": ""
},
@@ -3133,7 +3133,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/phpunit-mock-objects/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24.zip",
"reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
"shasum": ""
},
@@ -3192,7 +3192,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/code-unit-reverse-lookup/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18.zip",
"reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
"shasum": ""
},
@@ -3237,7 +3237,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
"url": "https://packagist.phpcomposer.com/files/sebastianbergmann/comparator/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be.zip",
"reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
"shasum": ""
},
@@ -3301,7 +3301,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/diff/7f066a26a962dbe58ddea9f72a4e82874a3975a4.zip",
"reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
"shasum": ""
},
@@ -3353,7 +3353,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/environment/5795ffe5dc5b02460c3e34222fee8cbe245d8fac.zip",
"reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
"shasum": ""
},
@@ -3403,7 +3403,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/exporter/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4.zip",
"reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
"shasum": ""
},
@@ -3521,7 +3521,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/object-enumerator/1311872ac850040a79c3c058bea3e22d0f09cbb7.zip",
"reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
"shasum": ""
},
@@ -3567,7 +3567,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/recursion-context/2c3ba150cbec723aa057506e73a8d33bdb286c9a.zip",
"reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
"shasum": ""
},
@@ -3620,7 +3620,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/resource-operations/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52.zip",
"reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
"shasum": ""
},
@@ -3662,7 +3662,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
"url": "https://files.phpcomposer.com/files/sebastianbergmann/version/99732be0ddb3361e16ad77b68ba41efc8e979019.zip",
"reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
"shasum": ""
},
@@ -3705,7 +3705,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/dff8fecf1f56990d88058e3a1885c2a5f1b8e970",
"url": "https://packagist.phpcomposer.com/files/symfony/dom-crawler/dff8fecf1f56990d88058e3a1885c2a5f1b8e970.zip",
"reference": "dff8fecf1f56990d88058e3a1885c2a5f1b8e970",
"shasum": ""
},
@@ -3761,7 +3761,7 @@
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
"url": "https://packagist.phpcomposer.com/files/webmozart/assert/2db61e59ff05fe5126d152bd0655c9ea113e550f.zip",
"reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
"shasum": ""
},
resources/views/good/goodList.blade.php
+58 -59
View File
@@ -8,71 +8,70 @@
@section('content')
<div class="row">
@include('layout.catlist')
<div class="hidden-md-up">&nbsp;</div>
<div class="col-12 col-md-10">
<div class="row">
<div class="col-12 col-md-2">
<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">
排序
</button>
<div class="dropdown-menu" aria-labelledby="sort">
<a href="/good/" class="dropdown-item">综合排序</a>
<a href="#" onclick="setc('p')" class="dropdown-item">按价格从低到高</a>
<a href="#" onclick="setc('pd')" class="dropdown-item">按价格从高到低</a>
<a href="#" onclick="setc('c')" class="dropdown-item">按库存从少到多</a>
<a href="#" onclick="setc('cd')" class="dropdown-item">按库存从多到少</a>
</div>
</div>
</div>
<div class="col-12 col-lg-6">
<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>
<div class="col-12 col-lg-4">
<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>
</div>
<br/>
<div class="row">
@foreach($goods as $good)
<div class="col-6 col-md-4 col-lg-3">
<div class="good" style="margin-bottom:20px;">
<a href="/good/{{ $good->id }}">
<div class="card">
<div class="card-img-top">
<img src="/good/{{ sha1($good->id) }}/titlepic" title="{{ $good->good_name }}" style="width:100%"/>
</div>
<div class="card-block">
<div style="word-break:break-all">{{ $good->good_name }}</div>
<div class="text-warning"><b>￥{{ $good->price }}</b></div>
@if($good->count==0)
<div class="text-danger">无库存QAQ</div>
@else
<div>库存：{{ $good->count }}</div>
@endif
@include('layout.catlist')
<div class="hidden-md-up">&nbsp;</div>
<div class="col-12 col-md-10">
<div class="row">
<div class="col-12 col-md-2">
<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">
排序
</button>
<div class="dropdown-menu" aria-labelledby="sort">
<a href="/good/" class="dropdown-item">综合排序</a>
<a href="#" onclick="setc('p')" class="dropdown-item">按价格从低到高</a>
<a href="#" onclick="setc('pd')" class="dropdown-item">按价格从高到低</a>
<a href="#" onclick="setc('c')" class="dropdown-item">按库存从少到多</a>
<a href="#" onclick="setc('cd')" class="dropdown-item">按库存从多到少</a>
</div>
</div>
</a>
</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>
<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>
</div>
<br/>
<div class="row">
@foreach($goods as $good)
<div class="col-6 col-md-4 col-lg-3">
<div class="good" style="margin-bottom:20px;">
<a href="/good/{{ $good->id }}">
<div class="card">
<div class="card-img-top">
<img src="/good/{{ sha1($good->id) }}/titlepic" title="{{ $good->good_name }}" style="width:100%"/>
</div>
<div class="card-block">
<div style="word-break:break-all">{{ $good->good_name }}</div>
<div class="text-warning"><b>￥{{ $good->price }}</b></div>
@if($good->count==0)
<div class="text-danger">无库存QAQ</div>
@else
<div>库存：{{ $good->count }}</div>
@endif
</div>
</div>
</a>
</div>
</div>
@endforeach
</div>
{{ $goods->appends([
'start_price' => $start_price,
'end_price' => $end_price,
'start_count' => $start_count,
'sort' => $sort,
'query' => $query,
'cat_id' => $cat_id
])
->links() }}
</div>
@endforeach
</div>
{{ $goods->appends([
'start_price' => $start_price,
'end_price' => $end_price,
'start_count' => $start_count,
'sort' => $sort,
'query' => $query,
'cat_id' => $cat_id
])
->links() }}
</div>
</div>
<script src="/js/good/cat.js"></script>
<script src="/js/good/good_list.js"></script>
<script src="/js/jquery.color.js"></script>
@endsection
@endsection
resources/views/user/userProfile.blade.php
+5 -2
View File
@@ -18,8 +18,9 @@
<div class="card-header">
<div class="row" style="margin-bottom:10px">
<div class="col-md-7 col-sm-12">
<figure class="figure">
<img src="/avatar/{{ $user->id }}/150/150" style="width:150px; height:150px; border-radius:50%; overflow:hidden;margin-bottom:10px" />
<div class="column" style="margin-bottom:10px;padding-left:5px">
<figcaption class="figure-caption text-center">
@if(isset($user->nickname))
用户名： {{ $user->nickname }}
@if($user->baned)
@@ -31,6 +32,9 @@
【已封禁】
@endif
@endif
</figcaption>
</figure>
<div class="column" style="margin-bottom:10px;padding-left:5px">
@if(isset($user->stuid))
@if(strlen($user->stuid) == 8)
@if(intval(substr($user->stuid, 0, 4)) == 2000 + env('FRESH_YEAR'))
@@ -56,7 +60,6 @@
<img src="https://img.shields.io/badge/%E5%85%88%E9%94%8B%E5%B8%82%E5%9C%BA-%E7%AE%A1%E7%90%86%E5%91%98-ee0000.svg">
@endif
</div>
</div>
<div class="col-md-5 col-sm-12" id="profile_bt">
@if(Session::get('user_id') == $user->id)