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

优化字体与前台地址等

This commit is contained in:
pushuo 2022-08-25 10:52:04 +08:00
parent c1465b321c
commit 088234a922
13 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/build/beike/admin/css/app.css vendored
View File

@ -4,8 +4,8 @@
src: url("/fonts/poppins/Poppins-Regular.ttf");
}
@font-face {
font-family: "poppins-bold";
src: url("/fonts/poppins/Poppins-Bold.ttf");
font-family: "Poppins-Medium";
src: url("/fonts/poppins/Poppins-Medium.ttf");
}
.min-h1 {
min-height: 100px;
@ -538,7 +538,7 @@ body.page-seller-product .share-link-pop .share-links-code img {
}
table.table thead th, .fw-bold, h1, h2, h3, h4, h5, h6, b, strong, .card .card-header {
font-family: "poppins-bold", sans-serif;
font-family: "Poppins-Medium", sans-serif;
}
[v-cloak] {

6
public/build/beike/shop/default/css/app.css vendored
View File

@ -25,8 +25,8 @@ body[class^=page-account-] {
src: url("/fonts/poppins/Poppins-Regular.ttf");
}
@font-face {
font-family: "poppins-bold";
src: url("/fonts/poppins/Poppins-Bold.ttf");
font-family: "Poppins-Medium";
src: url("/fonts/poppins/Poppins-Medium.ttf");
}
.min-h1 {
min-height: 100px;
@ -499,7 +499,7 @@ body[class^=page-account-] {
}
table.table thead th, .fw-bold, h1, h2, h3, h4, h5, h6, b, strong, .card .card-header {
font-family: "poppins-bold", sans-serif;
font-family: "Poppins-Medium", sans-serif;
}
header {

BIN
public/fonts/Jost/Jost400Book.otf
View File

Binary file not shown.

BIN
public/fonts/Jost/Jost400BookItalic.otf
View File

Binary file not shown.

BIN
public/fonts/Jost/Jost500Medium.otf
View File

Binary file not shown.

BIN
public/fonts/Jost/Jost600Semi.otf
View File

Binary file not shown.

BIN
public/fonts/cerebri-sans/Cerebri Sans Bold.ttf
View File

Binary file not shown.

BIN
public/fonts/cerebri-sans/Cerebri-Sans-Regular.ttf
View File

Binary file not shown.

BIN
public/fonts/poppins/Poppins-Medium.ttf Normal file
View File

Binary file not shown.

6
resources/beike/admin/css/_global.scss vendored
View File

@ -12,8 +12,8 @@
src: url('/fonts/poppins/Poppins-Regular.ttf');
}
@font-face {font-family: 'poppins-bold';
src: url('/fonts/poppins/Poppins-Bold.ttf');
@font-face {font-family: 'Poppins-Medium';
src: url('/fonts/poppins/Poppins-Medium.ttf');
}
@for $i from 1 through 6 {
@ -322,5 +322,5 @@ body.page-seller-product {
}
table.table thead th, .fw-bold, h1,h2,h3, h4, h5, h6, b, strong, .card .card-header {
font-family: 'poppins-bold', sans-serif;
font-family: 'Poppins-Medium', sans-serif;
}

6
resources/beike/shop/default/css/global.scss vendored
View File

@ -12,8 +12,8 @@ body[class^="page-account-"] {
src: url('/fonts/poppins/Poppins-Regular.ttf');
}
@font-face {font-family: 'poppins-bold';
src: url('/fonts/poppins/Poppins-Bold.ttf');
@font-face {font-family: 'Poppins-Medium';
src: url('/fonts/poppins/Poppins-Medium.ttf');
}
@for $i from 1 through 6 {
@ -257,5 +257,5 @@ body[class^="page-account-"] {
table.table thead th, .fw-bold, h1,h2,h3, h4, h5, h6, b, strong, .card .card-header {
font-family: 'poppins-bold', sans-serif;
font-family: 'Poppins-Medium', sans-serif;
}

5
themes/default/checkout.blade.php
View File

@ -35,7 +35,10 @@
<div class="zipcode">@{{ address.zipcode }}</div>
<div class="address-info">@{{ address.country }} @{{ address.zone }} @{{ address.city }} @{{ address.address_1 }}</div>
<div class="address-bottom">
<span class="badge bg-success" v-if="form.shipping_address_id == address.id">{{ __('shop/checkout.chosen') }}</span>
<div>
<span class="badge bg-success" v-if="form.shipping_address_id == address.id">{{ __('shop/checkout.chosen') }}</span>
{{-- <span class="badge bg-info" v-if="address.default">{{ __('shop/account.addresses.default_address') }}</span> --}}
</div>
<a class="" @click.stop="editAddress(index)">{{ __('shop/checkout.edit') }}</a>
</div>
</div>

2
themes/default/shared/address-form.blade.php
View File

@ -51,8 +51,6 @@
<el-form-item label="{{ __('address.default') }}">
<el-switch
v-model="{{ $address_form_key }}.default"
:active-value="1"
:inactive-value="0"
>
</el-switch>
</el-form-item>