diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 31d9ab7..8be34b2 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -94,7 +94,7 @@ 举报者ID 被举报者ID 受理管理员ID - 状态 + 状态 @foreach($reports as $repo) @@ -119,7 +119,14 @@
{!! csrf_field() !!} - + +
+ + +
+ {!! csrf_field() !!} + +
@else diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 2858c14..7f751c9 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -32,7 +32,7 @@
- +
diff --git a/resources/views/auth/ssoGuide.blade.php b/resources/views/auth/ssoGuide.blade.php index b6392a3..3432fd9 100644 --- a/resources/views/auth/ssoGuide.blade.php +++ b/resources/views/auth/ssoGuide.blade.php @@ -4,7 +4,7 @@ @section('content')
-

先锋市场当前仅允许校内人员注册使用。如果这是你第一次使用本网站，请点击下面的按钮，前往校园统一身份认证服务平台进行认证注册。

+

友情提示：校园统一身份认证服务平台的初始密码为校园卡查询密码。注意：此密码与校园卡是否修改过卡片的消费密码无关。这个密码可能是以下几种之一：校园卡身份证号后六位（“X”用“0”代替），学号后六位，「000000」。为了您的账号安全，强烈建议您修改校园统一身份认证服务平台（SSO）的密码。

校园统一身份认证服务平台

友情提示：校园统一身份认证服务平台的初始密码可能是身份证号后六位（"X"用"0"代替）。此密码与校园卡是否修改过密码无关。为了您的账号安全，强烈建议您修改校园统一身份认证服务平台的密码。

初次登录后，你可以为自己设置一个用户名，或者绑定你的邮箱，以使用它们进行登录。你也可以继续使用校卡平台进行快捷登录。

diff --git a/resources/views/good/goodInfo.blade.php b/resources/views/good/goodInfo.blade.php index b6b625b..2ffcd63 100644 --- a/resources/views/good/goodInfo.blade.php +++ b/resources/views/good/goodInfo.blade.php @@ -37,7 +37,7 @@
-

{{ $good->good_name }} +

{{ $good->good_name }}@if($good->baned)【已封禁】@endif @if(isset($inFvlst)) @if(count($inFvlst) == 0) @@ -51,16 +51,18 @@ @endif

- 卖家：{{ $user->nickname }} + 卖家：{{ $user->nickname }}@if($user->baned)【已封禁】@endif   和我联系
售价：

￥{{ $good->price }}

count==0) class="text-danger" @endif>@if($good->count>0) 库存：{{ $good->count }}件 @else 没库存了QAQ @endif

- @if (count($errors) > 0) - - @endif - @if(($good->user_id) != Session::get('user_id')) + @if (count($errors) > 0) + + @endif + @if(($good->user_id) != Session::get('user_id') && !$good->baned)
@@ -80,6 +82,12 @@ {!! method_field('DELETE') !!} + @endif + @if(Session::get('is_admin') >= 1 && !$good->baned) +
+ {!! csrf_field() !!} + +
@endif @if(Session::has('user_id') && $good->user_id!=Session::get('user_id'))
diff --git a/resources/views/good/goodInfoForm.blade.php b/resources/views/good/goodInfoForm.blade.php index a561f4b..53e1e81 100644 --- a/resources/views/good/goodInfoForm.blade.php +++ b/resources/views/good/goodInfoForm.blade.php @@ -45,9 +45,9 @@
-
+
- diff --git a/resources/views/good/goodInfoOnWelcome.blade.php b/resources/views/good/goodInfoOnWelcome.blade.php index 5a5fab2..b2c88f3 100644 --- a/resources/views/good/goodInfoOnWelcome.blade.php +++ b/resources/views/good/goodInfoOnWelcome.blade.php @@ -1,5 +1,5 @@
-
+
diff --git a/resources/views/good/goodList.blade.php b/resources/views/good/goodList.blade.php index 9d54fdd..f4ae8c8 100644 --- a/resources/views/good/goodList.blade.php +++ b/resources/views/good/goodList.blade.php @@ -38,7 +38,7 @@
@foreach($goods as $good)
-
+
diff --git a/resources/views/layout/footer.blade.php b/resources/views/layout/footer.blade.php index 9a33191..fa90cc5 100644 --- a/resources/views/layout/footer.blade.php +++ b/resources/views/layout/footer.blade.php @@ -15,10 +15,11 @@
© {{date("Y")}} 东北大学先锋网
-@if( env('APP_DEBUG') ) +@if( env('SHOW_VER') || env('APP_DEBUG') )
- 当前处于调试模式
程序版本：{{ config('app.version') }}   文件版本：{{ exec('git log --abbrev-commit --pretty=oneline -1') }} + @if(env('APP_DEBUG'))当前处于调试模式
@endif + @if(env('SHOW_VER'))程序版本：{{ config('app.version') }}   文件版本：{{ exec('git log --abbrev-commit --pretty=oneline -1') }}@endif
@endif diff --git a/resources/views/layout/header.blade.php b/resources/views/layout/header.blade.php index 7712062..fa6e85d 100644 --- a/resources/views/layout/header.blade.php +++ b/resources/views/layout/header.blade.php @@ -50,7 +50,7 @@
- + diff --git a/resources/views/message/message.blade.php b/resources/views/message/message.blade.php index 58b3595..e742788 100644 --- a/resources/views/message/message.blade.php +++ b/resources/views/message/message.blade.php @@ -8,10 +8,10 @@ {{--???--}}
- +
- +
diff --git a/resources/views/transaction.blade.php b/resources/views/transaction.blade.php index 4f2966f..b36c238 100644 --- a/resources/views/transaction.blade.php +++ b/resources/views/transaction.blade.php @@ -81,7 +81,7 @@ @foreach($seller->user_infos as $userinfo) - {{ $userinfo->realname }} + {{ $seller->realname }} {{ isset($userinfo->tel_num) ? $userinfo->tel_num : "" }} {{ isset($userinfo->QQ) ? $userinfo->QQ : "" }} {{ isset($userinfo->wechat) ? $userinfo->wechat : "" }} @@ -105,7 +105,7 @@ @foreach($buyer->user_infos as $userinfo) - {{ $userinfo->realname }} + {{ $seller->realname }} {{ isset($userinfo->tel_num) ? $userinfo->tel_num : "" }} {{ isset($userinfo->QQ) ? $userinfo->QQ : "" }} {{ isset($userinfo->wechat) ? $userinfo->wechat : "" }} diff --git a/resources/views/user/buyer.blade.php b/resources/views/user/buyer.blade.php index 99d7861..712bf37 100644 --- a/resources/views/user/buyer.blade.php +++ b/resources/views/user/buyer.blade.php @@ -19,7 +19,8 @@ @section('content')

我的订单

- + +
@@ -31,8 +32,11 @@ + @if(isset($tran->good)) + onMouseOver="toolTip('good_id) }}/titlepic>')" + onMouseOut="toolTip()" + @endif + >{{ isset($tran->good) ? $tran->good->good_name : "此商品已删除" }} @if($tran->status == 0)
订单编号 商品名称
{{ $tran->id }} {{ $tran->good->good_name }} {{ $tran->number }} diff --git a/resources/views/user/createUserInfo.blade.php b/resources/views/user/createUserInfo.blade.php index db76a30..b9507da 100644 --- a/resources/views/user/createUserInfo.blade.php +++ b/resources/views/user/createUserInfo.blade.php @@ -1,9 +1,22 @@ - - - - - +
+ + +
+
+ + +
+
+ + +
+
+ + +
{!! csrf_field() !!} - +
+ +
\ No newline at end of file diff --git a/resources/views/user/editUserExtra.blade.php b/resources/views/user/editUserExtra.blade.php index dac4b0f..b105edc 100644 --- a/resources/views/user/editUserExtra.blade.php +++ b/resources/views/user/editUserExtra.blade.php @@ -35,7 +35,7 @@ var prreader = new FileReader(); var reader = new FileReader(); reader.onload = function (evt) { - prevDiv.innerHTML = '
'; + prevDiv.innerHTML = ''; $jQuery_CROPPER('#avatarpreview').cropper({ aspectRatio: 1 / 1, crop: function (e) { @@ -58,7 +58,7 @@ }; prreader.readAsArrayBuffer(file.files[0]); } else { - prevDiv.innerHTML = '
'; + prevDiv.innerHTML = '
'; } } \ No newline at end of file diff --git a/resources/views/user/editUserInfo.blade.php b/resources/views/user/editUserInfo.blade.php index 1b69721..98f036d 100644 --- a/resources/views/user/editUserInfo.blade.php +++ b/resources/views/user/editUserInfo.blade.php @@ -1,6 +1,5 @@
- diff --git a/resources/views/user/seller/mygoods.blade.php b/resources/views/user/seller/mygoods.blade.php index e5648b9..bff3c91 100644 --- a/resources/views/user/seller/mygoods.blade.php +++ b/resources/views/user/seller/mygoods.blade.php @@ -8,7 +8,15 @@ @section('tab-content')
- + @if (count($errors) > 0) + + @endif +
+ @@ -17,6 +25,8 @@ + + @foreach($goods as $good) @@ -39,8 +49,9 @@ @endforeach - {{ $goods->links() }} +
# 商品名称修改信息 删除商品
{{ $good->id }}
+ {{ $goods->links() }}
diff --git a/resources/views/user/seller/sellerTrans.blade.php b/resources/views/user/seller/sellerTrans.blade.php index 2087696..eb38fe7 100644 --- a/resources/views/user/seller/sellerTrans.blade.php +++ b/resources/views/user/seller/sellerTrans.blade.php @@ -10,8 +10,15 @@
+ @if (count($errors) > 0) + + @endif - +
@@ -26,7 +33,7 @@ - + @if($tran->status == 0) - + --}}
订单编号 商品名称{{ $tran->good->good_name }}{{ $tran->buyer->nickname ? $tran->buyer->nickname : "无昵称用户" }}{{ $tran->buyer->nickname ? $tran->buyer->nickname : "无昵称用户" }}@if($tran->buyer->baned)【已封禁】@endif {{ $tran->number }} @@ -57,11 +64,11 @@ 查看交易 + {{-- -
{!! csrf_field() !!} diff --git a/resources/views/user/userInfo.blade.php b/resources/views/user/userInfo.blade.php index 3277662..6ee7eb4 100644 --- a/resources/views/user/userInfo.blade.php +++ b/resources/views/user/userInfo.blade.php @@ -1,5 +1,5 @@ @if(count($userinfos) != 0) - +
@@ -11,7 +11,7 @@ @foreach($userinfos as $userinfo) - + diff --git a/resources/views/user/userProfile.blade.php b/resources/views/user/userProfile.blade.php index 42f4a63..1619994 100644 --- a/resources/views/user/userProfile.blade.php +++ b/resources/views/user/userProfile.blade.php @@ -9,22 +9,81 @@ @section('content')
- @if(isset($user->nickname)) -

{{ $user->nickname }}

- @else -

还没有昵称>_<

- @endif +
+ @if(isset($user->nickname)) +

{{ $user->nickname }}

+ @else +

还没有昵称>_<

+ @endif +
+
- +
+

+ +

+

+ + @if(Session::has('user_id') && Session::get('user_id')!=$user->id) + + + + @endif +

+
+
+ +
+
+
+
+
真实姓名 手机
{{ $userinfo->realname }}{{ isset($user->realname) ? $user->realname : "" }} {{ isset($userinfo->tel_num) ? $userinfo->tel_num : "" }} {{ isset($userinfo->QQ) ? $userinfo->QQ : "" }} {{ isset($userinfo->wechat) ? $userinfo->wechat : "" }}
+ + + + + + + @foreach($goods as $good) + + + + + + + + @endforeach + {{ $goods->links() }} +
#商品名称商品价格剩余库存
{{ $good->id }}{{ $good->good_name }}{{ $good->price }}{{ $good->count }}
+ + + +
+
+
    + @foreach($tickets as $ticket) +
  • + +

    {{ $ticket->message }}

    +
    • + @endforeach +
+
+
+ + -
- - @if(Session::has('user_id') && Session::get('user_id')!=$user->id) -
- -
- @endif -
-@endsection +@endsection \ No newline at end of file diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index bdfd576..cc3bebf 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -35,7 +35,6 @@
@endif--}} @if(count($newgoods)>0) -

新品

@foreach($newgoods as $good) @@ -43,7 +42,6 @@ @endforeach
@endif -

随便看看

@foreach($cats as $cat) @if(count($catgoods[$cat->cat_name]))