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

解决了罗列的所有三个大问题

Browse Source
This commit is contained in:
catsworld
2017-06-18 01:54:40 +08:00
parent 5abe5db4bd
commit 78a23be593
3 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/user/editUserAccount.blade.php
+39 -20
View File
@@ -1,4 +1,16 @@
<div class="col-12 col-md-4">
<div class="row">
<div class="mx-auto">
@if (count($errors) > 0)
<div class="alert alert-danger" role="alert">
<span class="fa fa-exclamation-circle" aria-hidden="true"></span>
{!! $errors->first() !!}
</div>
@endif
</div>
</div>
<div class="row">
<div class="mx-auto">
<p>
<form action="/user/edit/username" method="POST">
{{ csrf_field() }}
@if($user->username=='')
@@ -8,9 +20,11 @@
<input type="submit" class="btn btn-primary" value="设置">
</div>
@else
<label>用户名：{{$user->username}}</label>
<label style="font-size:13px;line-height:38px">用户名：{{$user->username}}</label>
@endif
</form>
</p>
<p>
<form action="/user/edit/stuid" method="POST">
{{ csrf_field() }}
@if($user->stuid=='')
@@ -20,41 +34,46 @@
</div>
<input type="submit" class="btn btn-primary" name="stuid_submit" value="绑定">
@else
<label>学号：{{$user->stuid}}</label>
<label style="font-size:13px;line-height:38px">学号：　{{$user->stuid}}</label>
@endif
</p>
</form>
<p>
<form action="/user/edit/email" method="POST">
{{ csrf_field() }}
@if($user->email=='')
<div class="form-group">
<label for="email">邮箱</label>
<input type="email" name="email" id="email" class="form-control" value="{{$user->email}}" required>
<p><input type="email" name="email" id="email" class="form-control" value="{{$user->email}}" placeholder="邮箱" required></p>
<div class="row">
<div class="mx-auto">
<input type="submit" class="btn btn-primary" name="email_submit" value="绑定">
</div>
</div>
@else
<div class="form-group">
<label>邮箱：{{$user->email}}（@if($user->havecheckedemail) 已验证 @else 未验证 @endif）</label>
<label style="font-size:13px">邮箱：　{{$user->email}}（@if($user->havecheckedemail)已验证@else未验证@endif）</label>
<input type="hidden" name="email" id="email" class="form-control" value="{{$user->email}}">
<input type="submit" class="btn btn-primary" value="解绑">
<input type="submit" class="btn btn-warning" value="解绑">
</div>
@endif
</form>
<form action="/user/edit/password" method="POST">
</p>
</div>
</div>
<hr>
<div class="row row-password">
<div class="mx-auto">
<form action="/user/edit/password" method="POST" class="password-form">
{{ csrf_field() }}
@if($user->password!='')
<div class="form-group">
<label for="password">当前密码</label>
<input type="password" name="password" id="password" class="form-control" placeholder="必填" required>
</div>
<p><input type="password" name="password" id="password" class="form-control" placeholder="当前密码" required></p>
@endif
<div class="form-group">
<label for="newPassword">新密码</label>
<input type="password" name="newPassword" id="newPassword" class="form-control" placeholder="必填" required>
<p><input type="password" name="newPassword" id="newPassword" class="form-control" placeholder="新密码" required></p>
<p><input type="password" name="newPassword_confirmation" id="newPassword_confirmation" class="form-control" placeholder="确认新密码" required></p>
<div class="row">
<div class="mx-auto">
<input type="submit" class="btn btn-success" name="password_submit" value="保存">
</div>
<div class="form-group">
<label for="newPassword_confirmation">确认新密码</label>
<input type="password" name="newPassword_confirmation" id="newPassword_confirmation" class="form-control" placeholder="必填" required>
</div>
<input type="submit" class="btn btn-primary" name="password_submit" value="保存">
</form>
</div>
</div>
resources/views/user/user.blade.php
+29 -6
View File
@@ -21,6 +21,28 @@
.nav-pills {
width:100px;
}
.password-form {
width:300px;
}
.register-card {
width:768px;
}
#modify_user_info_form {
width:300px;
}
}
@media (max-width: 991px) {
.address-th {
max-width: 200px;
}
}
.table {
table-layout: fixed;
}
.table td {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
</style>
<script>
@@ -30,15 +52,21 @@
if (mq.matches) {
$('.row-first').attr('class','row row-first');
$('.row-card').attr('class','row row-card');
$('.row-password').attr('class','row row-password');
$('.nickname-form').attr('class','nickname-form row');
$('.nav-pills').attr('class','nav nav-pills flex-column');
$('.paowa').attr('class','paowa');
$('.table').attr('class','table table-hover');
$('.row-form').attr('class','row row-form');
} else {
$('.row-first').attr('class','row-first');
$('.row-card').attr('class','row-card');
$('.row-password').attr('class','row-password');
$('.nickname-form').attr('class','nickname-form');
$('.nav-pills').attr('class','nav nav-pills');
$('.paowa').attr('class','row paowa');
$('.table').attr('class','table table-hover table-responsive');
$('.row-form').attr('class','row-form');
}
}
</script>
@@ -46,11 +74,6 @@
@section('content')
@if (count($errors) > 0)
<label>
<span class="form-error is-visible">{{$errors->first()}}</span>
</label>
@endif
<div class="row-first" style="margin-top:20px">
<div class="mx-auto">
<div class="card main-card">
@@ -74,7 +97,7 @@
<form action="/user" method="POST" enctype="multipart/form-data">
@include('user.editUserExtra')
<div class="row">
<div class="ml-auto" style="margin-right:5px">
<div class="mx-auto">
<input class="btn btn-success" type="submit" name="submit" value="保存">
</div>
</div>
resources/views/user/userInfo.blade.php
+2
View File
@@ -1,3 +1,4 @@
<div id="userinfo-container">
<table class="table table-hover table-responsive" style="width:100%">
<tr>
<th style="width:130px">手机</th>
@@ -36,6 +37,7 @@
</div>
</div>
</div>
</div>
<script>
function editUserInfo(userinfo_id) {
$.ajax({