wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

This commit is contained in:
pushuo 2022-08-10 16:03:06 +08:00
parent 32896c07c0
commit 36afc88779
4 changed files with 93 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
public/build/beike/shop/default/css/bootstrap.css vendored
View File

@ -6781,7 +6781,7 @@
--bs-gray-900: #212529;
--bs-primary: #fd560f;
--bs-secondary: #6c757d;
--bs-success: #198754;
--bs-success: #71c20b;
--bs-info: #0dcaf0;
--bs-warning: #ffc107;
--bs-danger: #dc3545;
@ -6789,7 +6789,7 @@
--bs-dark: #212529;
--bs-primary-rgb: 253, 86, 15;
--bs-secondary-rgb: 108, 117, 125;
--bs-success-rgb: 25, 135, 84;
--bs-success-rgb: 113, 194, 11;
--bs-info-rgb: 13, 202, 240;
--bs-warning-rgb: 255, 193, 7;
--bs-danger-rgb: 220, 53, 69;
@ -8571,15 +8571,15 @@ progress {
}
.table-success {
--bs-table-bg: #d1e7dd;
--bs-table-striped-bg: #c7dbd2;
--bs-table-bg: #e3f3ce;
--bs-table-striped-bg: #d8e7c4;
--bs-table-striped-color: #000;
--bs-table-active-bg: #bcd0c7;
--bs-table-active-bg: #ccdbb9;
--bs-table-active-color: #000;
--bs-table-hover-bg: #c1d6cc;
--bs-table-hover-bg: #d2e1bf;
--bs-table-hover-color: #000;
color: #000;
border-color: #bcd0c7;
border-color: #ccdbb9;
}
.table-info {
@ -9325,7 +9325,7 @@ textarea.form-control-lg {
width: 100%;
margin-top: 0.25rem;
font-size: 0.875em;
color: #198754;
color: #71c20b;
}
.valid-tooltip {
@ -9337,8 +9337,8 @@ textarea.form-control-lg {
padding: 0.25rem 0.5rem;
margin-top: 0.1rem;
font-size: 0.7rem;
color: #fff;
background-color: rgba(25, 135, 84, 0.9);
color: #000;
background-color: rgba(113, 194, 11, 0.9);
border-radius: 0;
}
@ -9350,16 +9350,16 @@ textarea.form-control-lg {
}
.was-validated .form-control:valid, .form-control.is-valid {
border-color: #198754;
border-color: #71c20b;
padding-right: calc(1.5em + 0.92rem);
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%2371c20b' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
background-repeat: no-repeat;
background-position: right calc(0.375em + 0.23rem) center;
background-size: calc(0.75em + 0.46rem) calc(0.75em + 0.46rem);
}
.was-validated .form-control:valid:focus, .form-control.is-valid:focus {
border-color: #198754;
box-shadow: 0 0 0 0.25rem rgba(25, 135, 84, 0.25);
border-color: #71c20b;
box-shadow: 0 0 0 0.25rem rgba(113, 194, 11, 0.25);
}
.was-validated textarea.form-control:valid, textarea.form-control.is-valid {
@ -9368,30 +9368,30 @@ textarea.form-control-lg {
}
.was-validated .form-select:valid, .form-select.is-valid {
border-color: #198754;
border-color: #71c20b;
}
.was-validated .form-select:valid:not([multiple]):not([size]), .was-validated .form-select:valid:not([multiple])[size="1"], .form-select.is-valid:not([multiple]):not([size]), .form-select.is-valid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%2371c20b' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
background-position: right 0.75rem center, center right 2.25rem;
background-size: 16px 12px, calc(0.75em + 0.46rem) calc(0.75em + 0.46rem);
}
.was-validated .form-select:valid:focus, .form-select.is-valid:focus {
border-color: #198754;
box-shadow: 0 0 0 0.25rem rgba(25, 135, 84, 0.25);
border-color: #71c20b;
box-shadow: 0 0 0 0.25rem rgba(113, 194, 11, 0.25);
}
.was-validated .form-check-input:valid, .form-check-input.is-valid {
border-color: #198754;
border-color: #71c20b;
}
.was-validated .form-check-input:valid:checked, .form-check-input.is-valid:checked {
background-color: #198754;
background-color: #71c20b;
}
.was-validated .form-check-input:valid:focus, .form-check-input.is-valid:focus {
box-shadow: 0 0 0 0.25rem rgba(25, 135, 84, 0.25);
box-shadow: 0 0 0 0.25rem rgba(113, 194, 11, 0.25);
}
.was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label {
color: #198754;
color: #71c20b;
}
.form-check-inline .form-check-input ~ .valid-feedback {
@ -9595,33 +9595,33 @@ textarea.form-control-lg {
}
.btn-success {
color: #fff;
background-color: #198754;
border-color: #198754;
color: #000;
background-color: #71c20b;
border-color: #71c20b;
}
.btn-success:hover {
color: #fff;
background-color: #157347;
border-color: #146c43;
color: #000;
background-color: #86cb30;
border-color: #7fc823;
}
.btn-check:focus + .btn-success, .btn-success:focus {
color: #fff;
background-color: #157347;
border-color: #146c43;
box-shadow: 0 0 0 0 rgba(60, 153, 110, 0.5);
color: #000;
background-color: #86cb30;
border-color: #7fc823;
box-shadow: 0 0 0 0 rgba(96, 165, 9, 0.5);
}
.btn-check:checked + .btn-success, .btn-check:active + .btn-success, .btn-success:active, .btn-success.active, .show > .btn-success.dropdown-toggle {
color: #fff;
background-color: #146c43;
border-color: #13653f;
color: #000;
background-color: #8dce3c;
border-color: #7fc823;
}
.btn-check:checked + .btn-success:focus, .btn-check:active + .btn-success:focus, .btn-success:active:focus, .btn-success.active:focus, .show > .btn-success.dropdown-toggle:focus {
box-shadow: 0 0 0 0 rgba(60, 153, 110, 0.5);
box-shadow: 0 0 0 0 rgba(96, 165, 9, 0.5);
}
.btn-success:disabled, .btn-success.disabled {
color: #fff;
background-color: #198754;
border-color: #198754;
color: #000;
background-color: #71c20b;
border-color: #71c20b;
}
.btn-info {
@ -9825,27 +9825,27 @@ textarea.form-control-lg {
}
.btn-outline-success {
color: #198754;
border-color: #198754;
color: #71c20b;
border-color: #71c20b;
}
.btn-outline-success:hover {
color: #fff;
background-color: #198754;
border-color: #198754;
color: #000;
background-color: #71c20b;
border-color: #71c20b;
}
.btn-check:focus + .btn-outline-success, .btn-outline-success:focus {
box-shadow: 0 0 0 0 rgba(25, 135, 84, 0.5);
box-shadow: 0 0 0 0 rgba(113, 194, 11, 0.5);
}
.btn-check:checked + .btn-outline-success, .btn-check:active + .btn-outline-success, .btn-outline-success:active, .btn-outline-success.active, .btn-outline-success.dropdown-toggle.show {
color: #fff;
background-color: #198754;
border-color: #198754;
color: #000;
background-color: #71c20b;
border-color: #71c20b;
}
.btn-check:checked + .btn-outline-success:focus, .btn-check:active + .btn-outline-success:focus, .btn-outline-success:active:focus, .btn-outline-success.active:focus, .btn-outline-success.dropdown-toggle.show:focus {
box-shadow: 0 0 0 0 rgba(25, 135, 84, 0.5);
box-shadow: 0 0 0 0 rgba(113, 194, 11, 0.5);
}
.btn-outline-success:disabled, .btn-outline-success.disabled {
color: #198754;
color: #71c20b;
background-color: transparent;
}
@ -11418,7 +11418,7 @@ textarea.form-control-lg {
.alert {
position: relative;
padding: 1rem 1rem;
padding: 0.5rem 1rem;
margin-bottom: 1rem;
border: 1px solid transparent;
border-radius: 0;
@ -11440,7 +11440,7 @@ textarea.form-control-lg {
top: 0;
right: 0;
z-index: 2;
padding: 1.25rem 1rem;
padding: 0.625rem 1rem;
}
.alert-primary {
@ -11462,12 +11462,12 @@ textarea.form-control-lg {
}
.alert-success {
color: #0f5132;
background-color: #d1e7dd;
border-color: #badbcc;
color: #447407;
background-color: #e3f3ce;
border-color: #d4edb6;
}
.alert-success .alert-link {
color: #0c4128;
color: #365d06;
}
.alert-info {
@ -11818,17 +11818,17 @@ textarea.form-control-lg {
}
.list-group-item-success {
color: #0f5132;
background-color: #d1e7dd;
color: #447407;
background-color: #e3f3ce;
}
.list-group-item-success.list-group-item-action:hover, .list-group-item-success.list-group-item-action:focus {
color: #0f5132;
background-color: #bcd0c7;
color: #447407;
background-color: #ccdbb9;
}
.list-group-item-success.list-group-item-action.active {
color: #fff;
background-color: #0f5132;
border-color: #0f5132;
background-color: #447407;
border-color: #447407;
}
.list-group-item-info {
@ -12954,10 +12954,10 @@ textarea.form-control-lg {
}
.link-success {
color: #198754;
color: #71c20b;
}
.link-success:hover, .link-success:focus {
color: #146c43;
color: #8dce3c;
}
.link-info {
@ -13401,7 +13401,7 @@ textarea.form-control-lg {
}
.border-success {
border-color: #198754 !important;
border-color: #71c20b !important;
}
.border-info {

4
resources/beike/shop/default/css/bootstrap/bootstrap.scss vendored
View File

@ -9,6 +9,8 @@
//
$primary: #fd560f;
$success: #71c20b;
$font-size-base: 0.8rem;
$font-family-base: 'poppins', sans-serif;
$border-radius: 0;
@ -60,6 +62,8 @@ $dropdown-item-padding-y: .4rem;
$card-border-width: 0;
$alert-padding-y: 0.5rem;
// $dropdown-divider-bg: rgba(0, 0, 0, 0.1);
@import './bootstrap-icons';
@import 'node_modules/bootstrap-5.1.3/scss/bootstrap';

37
themes/default/account/edit.blade.php
View File

@ -26,27 +26,26 @@
<h5 class="card-title">修改个人信息</h5>
</div>
<div class="card-body h-600">
<div class="bg-light rounded-3 p-4 mb-4" style="background: #f6f9fc;">
<div class="d-flex align-items-center">
<img class="rounded-3" id="avatar" src="{{ image_resize($customer->avatar, 200, 200) }}" width="90">
<div class="ps-3">
<label class="btn btn-light shadow-sm bg-body mb-2" data-toggle="tooltip" title="Change your avatar">
<i class="bi bi-arrow-repeat"></i> 修改头像
<input type="file" class="d-none" id="update-btn" name="avatar" accept="image/*">
</label>
<div class="p mb-0 fs-ms text-muted">上传JPG、GIF或PNG图片。需要300 x 300。</div>
</div>
</div>
</div>
<form action="{{ shop_route('account.edit.update') }}" method="POST">
@csrf
{{ method_field('put') }}
@if (session('success'))
<div class="alert alert-success">
{{ session('success') }}
</div>
@include('shared.form-msg', ['msg' => session('success')])
@endif
<div class="bg-light rounded-3 p-4 mb-4" style="background: #f6f9fc;">
<div class="d-flex align-items-center">
<img class="rounded-3" id="avatar" src="{{ image_resize($customer->avatar, 200, 200) }}" width="90">
<div class="ps-3">
<label class="btn btn-light shadow-sm bg-body mb-2" data-toggle="tooltip" title="Change your avatar">
<i class="bi bi-arrow-repeat"></i> 修改头像
<input type="file" class="d-none" id="update-btn" name="avatar" accept="image/*">
</label>
<div class="p mb-0 fs-ms text-muted">上传JPG或PNG图片。建议300 x 300。</div>
</div>
</div>
</div>
<div class="row gx-4 gy-3">
<div class="col-sm-6">
<label class="form-label">名称</label>
@ -104,7 +103,6 @@
var files = e.target.files;
var done = function (url) {
$(this).val('');
// $('#c-image').prop('src', url);
image.src = url;
$('#modal').modal('show');
};
@ -154,8 +152,11 @@
canvas.toBlob(function (blob) {
var formData = new FormData();
formData.append('avatar', blob, 'avatar.png');
console.log(formData)
formData.append('file', blob, 'avatar.png');
formData.append('type', 'avatar');
$http.put('{{ shop_route('file.store') }}', formData).then(res => {
console.log(res);
})
});
}
});

5
themes/default/shared/form-msg.blade.php Normal file
View File

@ -0,0 +1,5 @@
<div class="alert alert-success alert-dismissible">
<i class="bi bi-check-circle-fill"></i>
{{ $msg }}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>