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

修改了一些细节方面的前端问题

Browse Source 
添加了SSO引导入口
This commit is contained in:
catsworld
2017-06-12 14:41:03 +08:00
parent 978d693f83
commit b93e241931
9 changed files with 73 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+2
View File
@@ -28,3 +28,5 @@ MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
ALLOW_REG=false
app/Http/Controllers/AuthController.php
+6 -2
View File
@@ -98,12 +98,16 @@ class AuthController extends Controller
public function showRegister()
{
return View::make('auth.register');
if (!env('ALLOW_REG', false)){
return View::make('auth.ssoGuide');
}else{
return View::make('auth.register');
}
}
public function register(RegisterRequest $request)
{
if (!env('ALLOW_REG', true)) {
if (!env('ALLOW_REG', false)) {
abort(404);
}
$input = $request->all();
resources/views/auth/login.blade.php
+1
View File
@@ -20,6 +20,7 @@
<label>密码<input type="password" id="password" name="password"></label>
{!! csrf_field() !!}
<input type="submit" class="hollow button" value="登录">
<input type="button" class="hollow button" value="注册" onclick="window.location.href='/register'">
</form>
</div>
</div>
resources/views/auth/ssoGuide.blade.php
+15
View File
@@ -0,0 +1,15 @@
@extends('layout.master')
@section('title', "注册")
@section('content')
<div class="row card">
<div class="medium-8 medium-centered small-11 small-centered columns" style="padding-top: 80px; padding-bottom: 80px">
　　先锋市场当前仅面向校内人员使用。若你是初次使用本网站服务，请点击下面的按钮，前往校园统一身份认证服务平台使用学号登录。该平台登录密码为你在未修改时的校园卡密码。初次登录后，你可以为自己设置一个用户名，或者绑定你的邮箱，以使用它们进行登录。你也可以再次使用校卡平台进行快捷登录。
<center><a href="/sso" class="button small-centered">校园统一身份认证服务平台</a></center>
</div>
</div>
</div>
@endsection
resources/views/good/goodInfo.blade.php
+21 -25
View File
@@ -34,11 +34,25 @@
</div>
<div class="small-12 medium-6 medium-offset-1 columns block"
style="background-color: white;margin-bottom: 10px;margin-top:10px">
<h2>{{ $good->good_name }}</h2>
<h2>
{{ $good->good_name }}
<span class="hide-for-small-only">
@if(isset($inFvlst))
@if(count($inFvlst) == 0)
<a class="fav_smt fav_smt-medium" onclick="add_favlist()">☆</a>
@endif
@if(count($inFvlst) != 0)
<a class="fav_smt fav_smt-medium" onclick="del_favlist()">★</a>
@endif
@else
<a class="fav_smt fav_smt-medium" onclick="window.location.href='/login'">☆</a>
@endif
</span>
</h2>
<div><!-- 放tag 和更多图片缩略图 --></div>
<h4 style="color: #cc4b37"><b>￥{{ $good->price }}</b></h4>
<div class="row">
<div class="small-5 columns hide-for-small-only">
<div class="columns hide-for-small-only" style="width:180px;">
@if(($good->user_id) != Session::get('user_id'))
<form action="/good/{{ $good->id }}/buy" method="post">
<div class="input-group gb_right">
@@ -50,8 +64,7 @@
</div>
</form>
@endif
<br>
<br>
<p id="ach" class="gb_right">(库存:{{ $good->count }}件)</p>
@if($good->user_id == Session::get('user_id') || Session::get('is_admin') == 2)
<form class="hide-for-small-only" action="/good/{{ $good->id }}/edit"
style="margin:0px;display:inline;">
@@ -64,29 +77,12 @@
<input type="submit" class="button gb_right" value="删除">
</form>
@endif
<p id="ach" class="gb_right">(库存:{{ $good->count }}件)</p>
</div>
</div>
</div>
</div>
<div class="row hide-for-small-only">
<div class="small-12 medium-6 medium-offset-6 columns block">
@if(isset($inFvlst))
<form id="fav">
{!! csrf_field() !!}
@if(count($inFvlst) == 0)
<input class="button fav_smt fav_smt-medium" type="button" name="submit1" onclick="add_favlist()"
value="收藏OvO"/>
@endif
@if(count($inFvlst) != 0)
<input class="button fav_smt fav_smt-medium" type="button" name="submit1" onclick="del_favlist()"
value="取消收藏QAQ"/>
@endif
</form>
@else
<input class="button" type="button" name="submit1" onclick="window.location.href='/login'"
value="收藏OvO"/>
@endif
</div>
</div>
@@ -113,11 +109,11 @@
url: "/good/{{ $good->id }}/add_favlist",
data: str_data,
success: function (msg) {
$('.fav_smt.fav_smt-small').val('取消收藏QAQ');
$('.fav_smt.fav_smt-small').text('★');
$jQuery_NEW('.fav_smt.fav_smt-small').attr('onclick', 'del_favlist()');
//what's this? interesting
$jQuery_NEW('.fav_smt.fav_smt-small').attr('style', 'width:100%;color:white;padding-left:0;padding-right:0');
$('.fav_smt.fav_smt-medium').val('取消收藏QAQ');
$('.fav_smt.fav_smt-medium').text('★');
$jQuery_NEW('.fav_smt.fav_smt-medium').attr('onclick', 'del_favlist()');
}
});
@@ -132,9 +128,9 @@
url: "/good/{{ $good->id }}/del_favlist",
data: str_data,
success: function (msg) {
$('.fav_smt.fav_smt-small').val('收藏OvO');
$('.fav_smt.fav_smt-small').text('☆');
$jQuery_NEW('.fav_smt.fav_smt-small').attr('onclick', 'add_favlist()');
$('.fav_smt.fav_smt-medium').val('收藏OvO');
$('.fav_smt.fav_smt-medium').text('☆');
$jQuery_NEW('.fav_smt.fav_smt-medium').attr('onclick', 'add_favlist()');
}
});
resources/views/layout/header.blade.php
+17 -14
View File
@@ -5,7 +5,7 @@
<div class="top-bar-filter"></div>
</div>
<div class="row">
<div class="medium-10 medium-offset-1 columns">
<div class="columns">
<div class="top-bar-left">
<ul class="dropdown menu hide-for-medium" data-dropdown-menu>
@if(Session::has('user_id'))
@@ -13,17 +13,19 @@
<li><a class="top-bar-list" href="/">主页</a></li>
<li><a class="top-bar-list" href="/message">消息</a></li>
@else
<li><a class="top-bar-list" href="/">主页</a></li>
<li class="is-dropdown-submenu-parent">
<a class="top-bar-list top-bar-dropdown" href="/login">登录&nbsp;</a>
<a class="top-bar-list top-bar-dropdown">登录&nbsp;</a>
<ul class="menu vertical top-bar-dropdown-menu">
<li><a href="/login">普通登录</a></li>
<li><a href="/register">校卡认证登录(SSO)</a></li>
<li><a href="/sso">校卡平台快捷登录</a></li>
</ul>
</li>
<li><a class="top-bar-list" href="/register">注册</a></li>
@endif
</ul>
<ul class="dropdown menu hide-for-small-only" data-dropdown-menu>
<li><a class="top-bar-list" href="/">跳蚤市场</a></li>
<li><a class="top-bar-list" href="/">主页</a></li>
</ul>
</div>
<div class="top-bar-right hide-for-small-only">
@@ -36,8 +38,8 @@
<ul class="menu vertical top-bar-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>
<hr>
<li><a href="/logout">登出</a></li>
</ul>
@@ -49,9 +51,10 @@
<a class="top-bar-list top-bar-dropdown" href="/login">登录&nbsp;</a>
<ul class="menu vertical top-bar-dropdown-menu">
<li><a href="/login">普通登录</a></li>
<li><a href="/register">校卡认证登录(SSO)</a></li>
<li><a href="/sso">校卡平台快捷登录</a></li>
</ul>
</li>
<li><a class="top-bar-list" href="/register">注册</a></li>
@endif
</ul>
</div>
@@ -64,7 +67,7 @@
</div>
</div>
<div class="row search-bar hide-for-small-only">
<div class="medium-10 medium-centered columns">
<div class="columns">
<div class="medium-12 columns">
<form action="/good" method="GET">
<div class="input-group float-right" id="top-bar-quick-access">
@@ -78,12 +81,12 @@
</div>
</div>
<div class="row search-bar hide-for-medium">
<div class="medium-10 medium-centered columns">
<div class="small-11 small-centered columns">
<form action="/good" method="GET">
<div class="input-group float-right" id="top-bar-quick-access-small">
<input class="input-group-field" type="search" name="query" id="searchq" placeholder="开始交易吧( '﹃'⑉)" value="<?php if(isset($_GET['query'])){echo $_GET['query']; } ?>"/>
<div class="input-group-button">
<input type="submit" class="button" value="G♂"/>
<input type="submit" class="button" value="G♂"/>
</div>
</div>
</form>
@@ -96,12 +99,12 @@
<li><a href="/logout">登出</a></li>
<hr>
<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>
<li><a href="/good/add" class="top-bar-button">出售</a></li>
@else
<li><a href="/register">注册</a></li>
<li><a href="/login">登录</a></li>
<li><a href="/register">注册</a></li>
<li><a href="/login">登录</a></li>
@endif
</ul>
resources/views/layout/master.blade.php
+1 -1
View File
@@ -25,7 +25,7 @@
<body>
@include('layout.header')
<div class="page-content row">
<div class="medium-10 medium-centered columns">
<div class="columns">
@yield('content')
</div>
</div>
resources/views/user/user.blade.php
+1 -2
View File
@@ -20,8 +20,7 @@
</label>
@endif
<ul class="tabs" data-tabs id="editinfo">
<li class="tabs-title @if($tab == "profile") is-active @endif"><a href="#extra" aria-selected="true">个人信息</a>
</li>
<li class="tabs-title @if($tab == "profile") is-active @endif"><a href="#extra" aria-selected="true">个人信息</a></li>
<li class="tabs-title @if($tab == "account") is-active @endif"><a href="#account">用户帐户</a></li>
<li class="tabs-title @if($tab == "contact") is-active @endif"><a href="#userinfo">联系方式</a></li>
</ul>
resources/views/welcome.blade.php
+9 -7
View File
@@ -9,15 +9,17 @@
@section('content')
<div class="row">
<div class="small-0 medium-2 columns">
<ul class="menu vertical hide-for-small-only">
<div class="medium-2 columns hide-for-small-only">
<ul class="menu vertical">
<li class="cat"><a href="/good">所有商品</a></li>
@foreach($cats as $cat)
<li class="cat"><a
href="/good?cat_id={{ $cat->id }}">{{ $cat->cat_name }}</a></li>
@endforeach
</ul>
<ul class="menu show-for-small-only" style="background-color: white;margin-bottom: 15px">
</div>
<div class="show-for-small-only ddd">
<ul class="menu">
<li class="cat"><a href="/good">所有商品</a></li>
@foreach($cats as $cat)
<li class="cat"><a
@@ -27,7 +29,7 @@
</div>
<div class="small-12 medium-10 columns">
<div class="row">
<div class="small-12 medium-8 columns">
<div class="medium-12 large-7 columns">
<div class="row">
@if(count($stargoods) > 0)
<div class="orbit" role="region" aria-label="热销商品" data-orbit>
@@ -52,7 +54,7 @@
</div>
@if(count($newgoods)>0)
<h3>新品</h3>
<div class="row small-up-2 medium-up-2 large-up-4">
<div class="row small-up-2 medium-up-4 large-up-3">
@foreach($newgoods as $good)
<div class="columns">
<div class="good">
@@ -93,7 +95,7 @@
@foreach($cats as $cat)
@if(count($catgoods[$cat->cat_name]))
<h4>{{ $cat->cat_name }}</h4>
<div class="row small-up-2 medium-up-2 large-up-4">
<div class="row small-up-2 medium-up-4 large-up-3">
@foreach($catgoods[$cat->cat_name] as $good)
<div class="columns">
<div class="good">
@@ -124,7 +126,7 @@
@endif
@endforeach
</div>
<div class="small-12 medium-4 columns">
<div class="hide-for-medium-only large-5 columns">
<div class="row">
<div class="medium-10 medium-offset-2 columns">
<div class="card">