The bootstrap is working fine now.

This commit is contained in:
catsworld
2017-06-14 16:36:50 +08:00
parent ebdb499cd4
commit 7950e5a3db
20 changed files with 168 additions and 61 deletions
+9 -2
View File
@@ -94,7 +94,7 @@
<th>举报者ID</th>
<th>被举报者ID</th>
<th>受理管理员ID</th>
<th>状态</th>
<th colspan="2">状态</th>
</tr>
</thead>
@foreach($reports as $repo)
@@ -119,7 +119,14 @@
<form action="/repo/{{ $repo->id }}/solve" method="POST">
{!! csrf_field() !!}
<input type="hidden" name="setstate" value="2">
<input type="submit" class="btn btn-primary" value="完成">
<input type="submit" class="btn btn-primary" value="批准显示">
</form>
</td>
<td>
<form action="/repo/{{ $repo->id }}/solve" method="POST">
{!! csrf_field() !!}
<input type="hidden" name="setstate" value="1">
<input type="submit" class="button" value="驳回此条">
</form>
</td>
@else
+1 -1
View File
@@ -32,7 +32,7 @@
<input type="submit" class="btn btn-primary" value="登录">
</div>
<div class="float-right">
<input type="button" class="btn btn-success" value="注册" onclick="window.location.href='/register'">
<input type="button" class="btn btn-success" value="校卡平台快捷登录" onclick="window.location.href='/sso'">
</div>
</form>
</div>
+1 -1
View File
@@ -4,7 +4,7 @@
@section('content')
<div class="jumbotron">
<p>先锋市场当前仅允许校内人员注册使用。如果这是你第一次使用本网站,请点击下面的按钮,前往校园统一身份认证服务平台进行认证注册。</p>
<p>友情提示:校园统一身份认证服务平台的初始密码为校园卡查询密码。注意:此密码与校园卡是否修改过卡片的消费密码无关。这个密码可能是以下几种之一:校园卡身份证号后六位(“X”用“0”代替),学号后六位,「000000」。为了您的账号安全,强烈建议您修改校园统一身份认证服务平台(SSO)的密码。</p>
<center><a href="/sso" class="btn btn-primary">校园统一身份认证服务平台</a></center><br/>
<p>友情提示:校园统一身份认证服务平台的初始密码可能是身份证号后六位("X"用"0"代替)。此密码与校园卡是否修改过密码无关。为了您的账号安全,强烈建议您修改校园统一身份认证服务平台的密码。</p>
<p>初次登录后,你可以为自己设置一个用户名,或者绑定你的邮箱,以使用它们进行登录。你也可以继续使用校卡平台进行快捷登录。</p>
+16 -8
View File
@@ -37,7 +37,7 @@
<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 }}
<h2 style="word-break:break-all">{{ $good->good_name }}@if($good->baned)【已封禁】@endif
<span class="hidden-sm-down">
@if(isset($inFvlst))
@if(count($inFvlst) == 0)
@@ -51,16 +51,18 @@
@endif
</span>
</h2>
卖家:<a href="/user/{{ $user->id }}">{{ $user->nickname }}</a>
卖家:<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>
<div @if($good->count==0) class="text-danger" @endif>@if($good->count>0) 库存:{{ $good->count }}件 @else 没库存了QAQ @endif</div><br/>
@if (count($errors) > 0)
<label>
<span class="form-error is-visible">{!! $errors->first() !!}</span>
</label>
@endif
@if(($good->user_id) != Session::get('user_id'))
@if (count($errors) > 0)
<div class="alert alert-danger" role="alert">
<span class="fa fa-exclamation-circle" aria-hidden="true"></span>
<span class="sr-only">Error:</span>
{!! $errors->first() !!}
</div>
@endif
@if(($good->user_id) != Session::get('user_id') && !$good->baned)
<form action="/good/{{ $good->id }}/buy" method="post">
<div class="input-group">
<input type="number" name="count" value="1" class="form-control"/>
@@ -80,6 +82,12 @@
{!! method_field('DELETE') !!}
<input type="submit" class="btn btn-primary" value="删除">
</form>
@endif
@if(Session::get('is_admin') >= 1 && !$good->baned)
<form action="/good/{{ $good->id }}/ban" method="POST" style="display:inline-block;">
{!! csrf_field() !!}
<input type="submit" class="btn btn-primary" value="封禁">
</form>
@endif
@if(Session::has('user_id') && $good->user_id!=Session::get('user_id'))
<br/><form action="/report/{{ $good->user_id }}" method="GET">
+2 -2
View File
@@ -45,9 +45,9 @@
<label for="price">商品价格</label>
<input type="number" min="0" name="price" id="price" value="{{count($errors) ? old('price') : $good->price}}" placeholder="商品价格" class="form-control">
</div>
<div class="form-group">
<div class="form-group hidden-xs-up">
<label>商品类型</label>
<select name="type" class="btn btn-secondary dropdown-toggle" style="width:100%">
<select name="type" class="btn btn-secondary dropdown-toggle" style="width:100%" value="0">
<option value="0" @if(($good->type==0&&!count($errors))||(old('type')==0&&count($errors))) selected="selected" @endif>普通商品</option>
<option value="1" @if(($good->type==1&&!count($errors))||(old('type')==1&&count($errors))) selected="selected" @endif>拍卖商品</option>
</select>
@@ -1,5 +1,5 @@
<div class="col-6 col-lg-4">
<div class="good">
<div class="good" style="margin-bottom:20px;">
<a href="/good/{{ $good->id }}">
<div class="card">
<div class="card-img-top">
+1 -1
View File
@@ -38,7 +38,7 @@
<div class="row">
@foreach($goods as $good)
<div class="col-6 col-md-4 col-lg-3">
<div class="good">
<div class="good" style="margin-bottom:20px;">
<a href="/good/{{ $good->id }}">
<div class="card">
<div class="card-img-top">
+3 -2
View File
@@ -15,10 +15,11 @@
<div class="hidden-lg-up">
<span><center>© {{date("Y")}} 东北大学先锋网</center></span>
</div>
@if( env('APP_DEBUG') )
@if( env('SHOW_VER') || env('APP_DEBUG') )
<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>
@if(env('APP_DEBUG'))当前处于调试模式<br>@endif
@if(env('SHOW_VER'))程序版本:{{ config('app.version') }}&nbsp;&nbsp; 文件版本:<ahref="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>@endif
</center>
</span>
@endif
+1 -1
View File
@@ -50,7 +50,7 @@
<div class="col-lg-12 navbar-search float-right">
<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'])){{ $_GET['query'] }}@endif"/>
<input type="text" class="form-control" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="@if(isset($_GET['query'])){{ urldecode($_GET['query']) }}@endif"/>
<span class="input-group-btn">
<input type="submit" class="btn btn-primary" value="G♂"/>
</span>
+2 -2
View File
@@ -8,10 +8,10 @@
{{--<a v-on:click="refreshContact">???</a>--}}
<div class="row">
<div class="col-lg-8 col-12">
<message-dialog ref="messageDialog" v-on:top-contact="topContactCallback"></message-dialog>
<message-dialog ref="messageDialog" v-on:top-contact="topContactCallback" v-on:network-error="stopTimerCallback"></message-dialog>
</div>
<div class="col-lg-4 col-12">
<contact-list ref="contactList" v-on:load-dialog="loadDialogCallback"></contact-list>
<contact-list ref="contactList" v-on:load-dialog="loadDialogCallback" v-on:network-error="stopTimerCallback"></contact-list>
</div>
</div>
</div>
+2 -2
View File
@@ -81,7 +81,7 @@
@foreach($seller->user_infos as $userinfo)
<tr>
<td>{{ $userinfo->realname }}</td>
<td>{{ $seller->realname }}</td>
<td>{{ isset($userinfo->tel_num) ? $userinfo->tel_num : "" }}</td>
<td>{{ isset($userinfo->QQ) ? $userinfo->QQ : "" }}</td>
<td>{{ isset($userinfo->wechat) ? $userinfo->wechat : "" }}</td>
@@ -105,7 +105,7 @@
@foreach($buyer->user_infos as $userinfo)
<tr>
<td>{{ $userinfo->realname }}</td>
<td>{{ $seller->realname }}</td>
<td>{{ isset($userinfo->tel_num) ? $userinfo->tel_num : "" }}</td>
<td>{{ isset($userinfo->QQ) ? $userinfo->QQ : "" }}</td>
<td>{{ isset($userinfo->wechat) ? $userinfo->wechat : "" }}</td>
+7 -3
View File
@@ -19,7 +19,8 @@
@section('content')
<h3>我的订单</h3>
<table class="table table-hover">
<label>友情提示:如果需要取消订单,请务必和对方沟通说明理由。恶意取消订单的行为可以举报。</label>
<table class="table table-hover table-responsive">
<tr>
<td>订单编号</td>
<td>商品名称</td>
@@ -31,8 +32,11 @@
<tr id="tran{{ $tran->id }}">
<td>{{ $tran->id }}</td>
<td><a href="/good/{{$tran->good_id}}"
onMouseOver="toolTip('<img src=/good/{{ sha1($tran->good_id) }}/titlepic>')"
onMouseOut="toolTip()">{{ $tran->good->good_name }}</a></td>
@if(isset($tran->good))
onMouseOver="toolTip('<img src=/good/{{ sha1($tran->good_id) }}/titlepic>')"
onMouseOut="toolTip()"
@endif
>{{ isset($tran->good) ? $tran->good->good_name : "此商品已删除" }}</a></td>
<td>{{ $tran->number }}</td>
@if($tran->status == 0)
<td>
+19 -6
View File
@@ -1,9 +1,22 @@
<form id="create_user_info_form">
<label>真实姓名<input type="text" name="realname"></label>
<label>手机<input type="text" name="tel_num"></label>
<label>QQ<input type="text" name="QQ"></label>
<label>微信<input type="text" name="wechat"></label>
<label>地址<textarea name="address"></textarea></label>
<div class="form-group col-10 offset-1 col-md-6 offset-md-3">
<label for="tel_num">手机</label>
<input type="text" name="tel_num" id="tel_num" class="form-control">
</div>
<div class="form-group col-10 offset-1 col-md-6 offset-md-3">
<label for="QQ">QQ</label>
<input type="text" name="QQ" id="QQ" class="form-control">
</div>
<div class="form-group col-10 offset-1 col-md-6 offset-md-3">
<label for="wechat">微信</label>
<input type="text" name="wechat" id="wechat" class="form-control">
</div>
<div class="form-group col-10 offset-1 col-md-6 offset-md-3">
<label for="address">地址</label>
<textarea name="address" id="address" class="form-control"></textarea>
</div>
{!! csrf_field() !!}
<input type="button" onclick="addUserInfo()" class="hollow button" value="保存">
<div class="form-group col-10 offset-1 col-md-6 offset-md-3">
<input type="button" onclick="addUserInfo()" class="btn btn-primary" value="保存">
</div>
</form>
+2 -2
View File
@@ -35,7 +35,7 @@
var prreader = new FileReader();
var reader = new FileReader();
reader.onload = function (evt) {
prevDiv.innerHTML = '<br/><img id="avatarpreview" src="' + evt.target.result + '" />';
prevDiv.innerHTML = '<img id="avatarpreview" src="' + evt.target.result + '" />';
$jQuery_CROPPER('#avatarpreview').cropper({
aspectRatio: 1 / 1,
crop: function (e) {
@@ -58,7 +58,7 @@
};
prreader.readAsArrayBuffer(file.files[0]);
} else {
prevDiv.innerHTML = '<br/><div class="img" style="filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale,src=\'' + file.value + '\'"></div>';
prevDiv.innerHTML = '<div class="img" style="filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale,src=\'' + file.value + '\'"></div>';
}
}
</script>
@@ -1,6 +1,5 @@
<form id="modify_user_info_form">
<input type="hidden" type="text" name="id" value="{{$userinfo[0]->id}}">
<label>真实姓名<input type="text" name="realname" value="{{$userinfo[0]->realname}}"></label>
<label>手机<input type="text" name="tel_num" value="{{$userinfo[0]->tel_num}}"></label>
<label>QQ<input type="text" name="QQ" value="{{$userinfo[0]->QQ}}"></label>
<label>微信<input type="text" name="wechat" value="{{$userinfo[0]->wechat}}"></label>
+13 -2
View File
@@ -8,7 +8,15 @@
@section('tab-content')
<div role="tabpanel" class="tab-pane active" id="goods">
<table class="table table-hover">
@if (count($errors) > 0)
<div class="alert alert-danger" role="alert">
<span class="fa fa-exclamation-circle" aria-hidden="true"></span>
<span class="sr-only">Error:</span>
{!! $errors->first() !!}
</div>
@endif
<table class="table table-hover table-responsive">
<thead>
<tr>
<th>#</th>
<th>商品名称</th>
@@ -17,6 +25,8 @@
<th>修改信息</th>
<th>删除商品</th>
</tr>
</thead>
<tbody>
@foreach($goods as $good)
<tr id="good{{ $good->id }}">
<td>{{ $good->id }}</td>
@@ -39,8 +49,9 @@
</td>
</tr>
@endforeach
{{ $goods->links() }}
</tbody>
</table>
{{ $goods->links() }}
</div>
<div role="tabpanel" class="tab-pane" id="trans">
</div>
@@ -10,8 +10,15 @@
<div role="tabpanel" class="tab-pane" id="goods">
</div>
<div role="tabpanel" class="tab-pane active" id="trans">
@if (count($errors) > 0)
<div class="alert alert-danger" role="alert">
<span class="fa fa-exclamation-circle" aria-hidden="true"></span>
<span class="sr-only">Error:</span>
{!! $errors->first() !!}
</div>
@endif
<label>友情提示:如果需要取消订单,请务必和对方沟通说明理由。恶意取消订单的行为可以举报。</label>
<table class="table">
<table class="table table-hover table-responsive">
<tr>
<td>订单编号</td>
<td>商品名称</td>
@@ -26,7 +33,7 @@
<td><a href="/good/{{$tran->good_id}}"
onMouseOver="toolTip('<img src=/good/{{ sha1($tran->good_id) }}/titlepic>')"
onMouseOut="toolTip()">{{ $tran->good->good_name }}</a></td>
<td>{{ $tran->buyer->nickname ? $tran->buyer->nickname : "无昵称用户" }}</td>
<td><a href="/user/{{ $tran->buyer_id }}">{{ $tran->buyer->nickname ? $tran->buyer->nickname : "无昵称用户" }}@if($tran->buyer->baned)【已封禁】@endif</a></td>
<td>{{ $tran->number }}</td>
@if($tran->status == 0)
<td>
@@ -57,11 +64,11 @@
<td>
<a href="/trans/{{ $tran->id }}">查看交易</a>
</td>
<td>
{{--<td>
<form action="#">
<input type="submit" class="button" value="修改订单" style="margin: 0;">
</form>
</td>
</td>--}}
<td>
<form method="POST" action="/trans/{{ $tran->id }}/confirm">
{!! csrf_field() !!}
+2 -2
View File
@@ -1,5 +1,5 @@
@if(count($userinfos) != 0)
<table class="table table-hover">
<table class="table table-hover table-responsive">
<tr>
<th>真实姓名</th>
<th>手机</th>
@@ -11,7 +11,7 @@
@foreach($userinfos as $userinfo)
<tr>
<td>{{ $userinfo->realname }}</td>
<td>{{ isset($user->realname) ? $user->realname : "" }}</td>
<td>{{ isset($userinfo->tel_num) ? $userinfo->tel_num : "" }}</td>
<td>{{ isset($userinfo->QQ) ? $userinfo->QQ : "" }}</td>
<td>{{ isset($userinfo->wechat) ? $userinfo->wechat : "" }}</td>
+75 -16
View File
@@ -9,22 +9,81 @@
@section('content')
<div class="row">
@if(isset($user->nickname))
<h2>{{ $user->nickname }}</h2>
@else
<h2>还没有昵称>_<</h2>
@endif
<div class="column">
@if(isset($user->nickname))
<h2>{{ $user->nickname }}</h2>
@else
<h2>还没有昵称&gt;_&lt;</h2>
@endif
</div>
</div>
<div class="row">
<img src="/avatar/{{ $user->id }}/256/256"/>
<div class="column" style="max-width: 256px">
<p>
<img src="/avatar/{{ $user->id }}/256/256"/>
</p>
<p>
<input type="button" value="和他联系" class="button"
onclick="window.location.href='/message/startConversation/{{ $user->id }}'"/>
@if(Session::has('user_id') && Session::get('user_id')!=$user->id)
<form action="/report/{{ $user->id }}" method="GET">
<input type="submit" class="button" value="举报该卖家">
</form>
@endif
</p>
</div>
<div class="column medium-8 large-9">
<ul class="tabs" data-tabs id="editinfo">
<li class="tabs-title is-active"><a href="#goods" aria-selected="true">他的商品</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">
<div class="card-section">
<div class="row table-responsive">
<table class="table">
<tr>
<td>#</td>
<td>商品名称</td>
<td>商品价格</td>
<td>剩余库存</td>
</tr>
@foreach($goods as $good)
<tr id="good{{ $good->id }}">
<td>{{ $good->id }}</td>
<td><a href="/good/{{$good->id}}"
onMouseOver="toolTip('<img src=/good/{{ sha1($good->id) }}/titlepic>')"
onMouseOut="toolTip()">{{ $good->good_name }}</a></td>
<td>{{ $good->price }}</td>
<td>{{ $good->count }}</td>
</tr>
@endforeach
{{ $goods->links() }}
</table>
</div>
</div>
</div>
<div class="tabs-panel" id="tickets">
<div id="tickets-container" class="card-section">
<ul>
@foreach($tickets as $ticket)
<li>
<label>{{ $ticket->created_at }}
@if($ticket->type == 1)
评价
@else
举报
@endif
</label>
<p>{{ $ticket->message }}</p>
</li>
@endforeach
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<input type="button" value="开始聊天吧" class="button"
onclick="window.location.href='/message/startConversation/{{ $user->id }}'"/>
@if(Session::has('user_id') && Session::get('user_id')!=$user->id)
<form action="/report/{{ $user->id }}" method="GET">
<input type="submit" class="button" value="举报该卖家">
</form>
@endif
</div>
@endsection
@endsection
-2
View File
@@ -35,7 +35,6 @@
<br/>
@endif--}}
@if(count($newgoods)>0)
<br/>
<h3>新品</h3>
<div class="row">
@foreach($newgoods as $good)
@@ -43,7 +42,6 @@
@endforeach
</div>
@endif
<br/>
<h3>随便看看</h3>
@foreach($cats as $cat)
@if(count($catgoods[$cat->cat_name]))