Skip to content

J
joshine
Commit 2e7c4488 by 王东红
Options

优化用户中心界面布局

parent d91291c0
Showing with 401 additions and 73 deletions
app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
...@@ -27,79 +27,6 @@ $viewModel = $block->getViewModel(); ...@@ -27,79 +27,6 @@ $viewModel = $block->getViewModel();
<?php $_streetValidationClass = $viewModel->addressGetAttributeValidationClass('street'); ?> <?php $_streetValidationClass = $viewModel->addressGetAttributeValidationClass('street'); ?>
<?php $_streetValidationClassNotRequired = trim(str_replace('required-entry', '', $_streetValidationClass)); ?> <?php $_streetValidationClassNotRequired = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
<?php $_regionValidationClass = $viewModel->addressGetAttributeValidationClass('region'); ?> <?php $_regionValidationClass = $viewModel->addressGetAttributeValidationClass('region'); ?>
<style type="text/css">
@media(min-width: 768px){
.form-edit-account>.fieldset, .form-address-edit>.fieldset{
float:none;
width: 100%;
max-width: none;
}
}
.action.primary{
vertical-align: middle;
-webkit-transform: perspective(1px) translateZ(0);
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgb(0 0 0 / 0%);
border-radius: 0px;
background-color: #222222;
box-shadow: none;
color: #ffffff;
display: inline-block;
font-family: 'Outfit', sans-serif;
font-weight: normal;
padding: 18px 50px;
line-height: 1;
text-shadow: none;
text-transform: capitalize;
white-space: nowrap;
font-size: 13px;
border-radius: 2px;
border: 2px solid #222222;
background-image: none;
text-align: center;
border: none;
text-transform: uppercase;
font-weight: normal !important;
transition: all 0.4s ease;
-webkit-transition: all 0.4s ease;
}
input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"], input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
border: 1px solid #e1e1e1;
height: 50px;
padding: 5px;
border-radius: 3px;
box-shadow: none;
}
select {
background: #ffffff;
background-clip: padding-box;
border: 1px solid #c2c2c2;
border-radius: 1px;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 14px;
height: 32px;
line-height: 1.42857143;
padding: 5px 10px 4px;
vertical-align: baseline;
width: 100%;
box-sizing: border-box;
}
.fieldset > .field:not(.choice) > .label{
color: #666666;
font-size: 14px;
}
.account .fieldset .legend{
font-size: 18px;
border: none;
}
input{
box-shadow: inset 0 -2px #e7e7e7;
}
.field.choice>[type="radio"], .field.choice>[type="checkbox"] {
margin-top: 4px;
}
</style>
<form class="form-address-edit" <form class="form-address-edit"
action="<?= $escaper->escapeUrl($block->getSaveUrl()) ?>" action="<?= $escaper->escapeUrl($block->getSaveUrl()) ?>"
method="post" method="post"
......
app/design/frontend/Joshine/breeze/Magento_Customer/templates/address/edit.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/** @var \Magento\Customer\Block\Address\Edit $block */
/** @var \Magento\Customer\ViewModel\Address $viewModel */
/** @var \Magento\Framework\Escaper $escaper */
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
$viewModel = $block->getViewModel();
?>
<?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
<?php $_telephone = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Telephone::class) ?>
<?php $_fax = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Fax::class) ?>
<?php $_country_id = $block->getAttributeData()->getFrontendLabel('country_id'); ?>
<?php $_street = $block->getAttributeData()->getFrontendLabel('street'); ?>
<?php $_city = $block->getAttributeData()->getFrontendLabel('city'); ?>
<?php $_region = $block->getAttributeData()->getFrontendLabel('region'); ?>
<?php $_selectRegion = 'Please select a region, state or province.'; ?>
<?php $_displayAll = $block->getConfig('general/region/display_all'); ?>
<?php $_vatidValidationClass = $viewModel->addressGetAttributeValidationClass('vat_id'); ?>
<?php $_cityValidationClass = $viewModel->addressGetAttributeValidationClass('city'); ?>
<?php $_postcodeValidationClass_value = $viewModel->addressGetAttributeValidationClass('postcode'); ?>
<?php $_postcodeValidationClass = $_postcodeValidationClass_value; ?>
<?php $_streetValidationClass = $viewModel->addressGetAttributeValidationClass('street'); ?>
<?php $_streetValidationClassNotRequired = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
<?php $_regionValidationClass = $viewModel->addressGetAttributeValidationClass('region'); ?>
<style type="text/css">
@media(min-width: 768px){
.form-edit-account>.fieldset, .form-address-edit>.fieldset{
float:none;
width: 100%;
max-width: none;
}
}
.action.primary{
vertical-align: middle;
-webkit-transform: perspective(1px) translateZ(0);
transform: perspective(1px) translateZ(0);
box-shadow: 0 0 1px rgb(0 0 0 / 0%);
border-radius: 0px;
background-color: #222222;
box-shadow: none;
color: #ffffff;
display: inline-block;
font-family: 'Outfit', sans-serif;
font-weight: normal;
padding: 18px 50px;
line-height: 1;
text-shadow: none;
text-transform: capitalize;
white-space: nowrap;
font-size: 13px;
border-radius: 2px;
border: 2px solid #222222;
background-image: none;
text-align: center;
border: none;
text-transform: uppercase;
font-weight: normal !important;
transition: all 0.4s ease;
-webkit-transition: all 0.4s ease;
}
input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"], input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea {
border: 1px solid #e1e1e1;
height: 50px;
padding: 5px;
border-radius: 3px;
box-shadow: none;
}
select {
background: #ffffff;
background-clip: padding-box;
border: 1px solid #c2c2c2;
border-radius: 1px;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 14px;
height: 32px;
line-height: 1.42857143;
padding: 5px 10px 4px;
vertical-align: baseline;
width: 100%;
box-sizing: border-box;
}
.fieldset > .field:not(.choice) > .label{
color: #666666;
font-size: 14px;
}
.account .fieldset .legend{
font-size: 18px;
border: none;
}
input{
box-shadow: inset 0 -2px #e7e7e7;
}
.field.choice>[type="radio"], .field.choice>[type="checkbox"] {
margin-top: 4px;
}
</style>
<form class="form-address-edit"
action="<?= $escaper->escapeUrl($block->getSaveUrl()) ?>"
method="post"
id="form-validate"
enctype="multipart/form-data"
data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>">
<fieldset class="fieldset">
<legend class="legend"><span><?= $escaper->escapeHtml(__('Contact Information')) ?></span></legend><br>
<?= $block->getBlockHtml('formkey') ?>
<input type="hidden" name="success_url" value="<?= $escaper->escapeUrl($block->getSuccessUrl()) ?>">
<input type="hidden" name="error_url" value="<?= $escaper->escapeUrl($block->getErrorUrl()) ?>">
<?= $block->getNameBlockHtml() ?>
<?php if ($_company->isEnabled()): ?>
<?= $_company->setCompany($block->getAddress()->getCompany())->toHtml() ?>
<?php endif ?>
<?php if ($_telephone->isEnabled()): ?>
<?= $_telephone->setTelephone($block->getAddress()->getTelephone())->toHtml() ?>
<?php endif ?>
<?php if ($_fax->isEnabled()): ?>
<?= $_fax->setFax($block->getAddress()->getFax())->toHtml() ?>
<?php endif ?>
</fieldset>
<fieldset class="fieldset">
<legend class="legend"><span><?= $escaper->escapeHtml(__('Address')) ?></span></legend><br>
<div class="field street required">
<label for="street_1" class="label"><span><?= /* @noEscape */ $_street ?></span></label>
<div class="control">
<div class="field primary">
<label for="street_1" class="label">
<span>
<?= $escaper->escapeHtml(__('Street Address: Line %1', 1)) ?>
</span>
</label>
</div>
<input type="text"
name="street[]"
value="<?= $escaper->escapeHtmlAttr($block->getStreetLine(1)) ?>"
title="<?= /* @noEscape */ $_street ?>"
id="street_1"
class="input-text <?= $escaper->escapeHtmlAttr($_streetValidationClass) ?>"/>
<div class="nested">
<?php for ($_i = 1, $_n = $viewModel->addressGetStreetLines(); $_i < $_n; $_i++): ?>
<div class="field additional">
<label class="label" for="street_<?= /* @noEscape */ $_i + 1 ?>">
<span><?= $escaper->escapeHtml(__('Street Address: Line %1', $_i + 1)) ?></span>
</label>
<div class="control">
<input type="text" name="street[]"
value="<?= $escaper->escapeHtmlAttr($block->getStreetLine($_i + 1)) ?>"
title="<?= $escaper->escapeHtmlAttr(__('Street Address %1', $_i + 1)) ?>"
id="street_<?= /* @noEscape */ $_i + 1 ?>"
class="input-text
<?= $escaper->escapeHtmlAttr($_streetValidationClassNotRequired) ?>">
</div>
</div>
<?php endfor; ?>
</div>
</div>
</div>
<?php if ($viewModel->addressIsVatAttributeVisible()): ?>
<div class="field taxvat">
<label class="label" for="vat_id">
<span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?></span>
</label>
<div class="control">
<input type="text"
name="vat_id"
value="<?= $escaper->escapeHtmlAttr($block->getAddress()->getVatId()) ?>"
title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('vat_id') ?>"
class="input-text <?= $escaper->escapeHtmlAttr($_vatidValidationClass) ?>"
id="vat_id">
</div>
</div>
<?php endif; ?>
<div class="field country required">
<label class="label" for="country">
<span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('country_id') ?></span>
</label>
<div class="control">
<?= $block->getCountryHtmlSelect() ?>
</div>
</div>
<div class="field region required">
<label class="label" for="region_id">
<span><?= /* @noEscape */ $_region ?></span>
</label>
<div class="control">
<select id="region_id" name="region_id"
title="<?= /* @noEscape */ $_region ?>"
class="validate-select region_id"
<?= /* @noEscape */ !$_displayAll ? ' disabled="disabled"' : '' ?>>
<option value=""><?= $escaper->escapeHtml(__($_selectRegion)) ?></option>
</select>
<input type="text"
id="region"
name="region"
value="<?= $escaper->escapeHtmlAttr($block->getRegion()) ?>"
title="<?= /* @noEscape */ $_region ?>"
class="input-text validate-not-number-first
<?= $escaper->escapeHtmlAttr($_regionValidationClass) ?>"
<?= !$_displayAll ? ' disabled="disabled"' : '' ?>/>
</div>
</div>
<div class="field city required">
<label class="label" for="city">
<span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('city') ?></span>
</label>
<div class="control">
<input type="text"
name="city"
value="<?= $escaper->escapeHtmlAttr($block->getAddress()->getCity()) ?>"
title="<?= $escaper->escapeHtmlAttr(__('City')) ?>"
class="input-text <?= $escaper->escapeHtmlAttr($_cityValidationClass) ?>"
id="city">
</div>
</div>
<div class="field zip required">
<label class="label" for="zip">
<span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?></span>
</label>
<div class="control">
<input type="text"
name="postcode"
value="<?= $escaper->escapeHtmlAttr($block->getAddress()->getPostcode()) ?>"
title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>"
id="zip"
class="input-text validate-zip-international
<?= $escaper->escapeHtmlAttr($_postcodeValidationClass) ?>">
<div role="alert" class="message warning">
<span></span>
</div>
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div.message.warning') ?>
</div>
</div>
<?php if ($block->isDefaultBilling()): ?>
<div class="message info">
<span><?= $escaper->escapeHtml(__("It's a default billing address.")) ?></span>
</div>
<?php elseif ($block->canSetAsDefaultBilling()): ?>
<div class="field choice set billing">
<input type="checkbox" id="primary_billing" name="default_billing" value="1" class="checkbox">
<label class="label" for="primary_billing">
<span><?= $escaper->escapeHtml(__('Use as my default billing address')) ?></span>
</label>
</div>
<?php else: ?>
<input type="hidden" name="default_billing" value="1" />
<?php endif; ?>
<?php if ($block->isDefaultShipping()): ?>
<div class="message info">
<span><?= $escaper->escapeHtml(__("It's a default shipping address.")) ?></span>
</div>
<?php elseif ($block->canSetAsDefaultShipping()): ?>
<div class="field choice set shipping">
<input type="checkbox" id="primary_shipping" name="default_shipping" value="1" class="checkbox">
<label class="label" for="primary_shipping">
<span><?= $escaper->escapeHtml(__('Use as my default shipping address')) ?></span>
</label>
</div>
<?php else: ?>
<input type="hidden" name="default_shipping" value="1">
<?php endif; ?>
</fieldset>
<div class="actions-toolbar">
<div class="primary">
<button type="submit"
class="action save primary"
data-action="save-address"
disabled="disabled"
title="<?= $escaper->escapeHtmlAttr(__('Save Address')) ?>">
<span><?= $escaper->escapeHtml(__('Save Address')) ?></span>
</button>
</div>
<div class="secondary">
<a class="action back" href="<?= $escaper->escapeUrl($block->getBackUrl()) ?>">
<span><?= $escaper->escapeHtml(__('Go back')) ?></span>
</a>
</div>
</div>
</form>
<script type="text/x-magento-init">
{
"#form-validate": {
"addressValidation": {
"postCodes": <?= /* @noEscape */ $block->getPostCodeConfig()->getSerializedPostCodes() ?>
}
},
"#country": {
"regionUpdater": {
"optionalRegionAllowed": <?= /* @noEscape */ $_displayAll ? 'true' : 'false' ?>,
"regionListId": "#region_id",
"regionInputId": "#region",
"postcodeId": "#zip",
"form": "#form-validate",
"regionJson": <?= /* @noEscape */ $viewModel->dataGetRegionJson() ?>,
"defaultRegion": "<?= (int) $block->getRegionId() ?>",
"countriesWithOptionalZip": <?= /* @noEscape */ $viewModel->dataGetCountriesWithOptionalZip(true) ?>
}
}
}
</script>
app/design/frontend/Joshine/breeze/Magento_Review/templates/customer/list.phtml 0 → 100644
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
/**
* @var \Magento\Review\Block\Customer\ListCustomer $block
* @var \Magento\Framework\Escaper $escaper
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
*/
/** @var \Magento\Review\Helper\Data $reviewHelper */
$reviewHelper = $block->getData('reviewHelper');
?>
<style type="text/css">
table .id a:last-child, table .actions a:last-child{color: #666666;}
</style>
<?php if ($block->getReviews() && count($block->getReviews())): ?>
<div class="table-wrapper reviews">
<table class="data table table-reviews" id="my-reviews-table">
<caption class="table-caption"><?= $escaper->escapeHtml(__('Product Reviews')) ?></caption>
<thead>
<tr>
<th scope="col" class="col date"><?= $escaper->escapeHtml(__('Created')) ?></th>
<th scope="col" class="col item"><?= $escaper->escapeHtml(__('Product Name')) ?></th>
<th scope="col" class="col summary"><?= $escaper->escapeHtml(__('Rating')) ?></th>
<th scope="col" class="col description"><?= $escaper->escapeHtml(__('Review')) ?></th>
<th scope="col" class="col actions">&nbsp;</th>
</tr>
</thead>
<tbody>
<?php foreach ($block->getReviews() as $review): ?>
<tr>
<td data-th="<?= $escaper->escapeHtml(__('Created')) ?>"
class="col date"><?= $escaper->escapeHtml($block->dateFormat($review->getReviewCreatedAt())) ?>
</td>
<td data-th="<?= $escaper->escapeHtml(__('Product Name')) ?>" class="col item">
<strong class="product-name">
<a href="<?= $escaper->escapeUrl($block->getProductUrl($review)) ?>">
<?= $escaper->escapeHtml($review->getName()) ?>
</a>
</strong>
</td>
<td data-th="<?= $escaper->escapeHtml(__('Rating')) ?>" class="col summary">
<?php if ($review->getSum()): ?>
<div class="rating-summary">
<span class="label"><span><?= $escaper->escapeHtml(__('Rating')) ?>:</span></span>
<div class="rating-result"
title="<?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%">
<span class="rating_<?= $escaper->escapeUrl($review->getReviewId())?>">
<span>
<?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%
</span>
</span>
</div>
</div>
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
"width:" . /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) . "%;",
'div.rating-summary div.rating-result>span.rating_' . $escaper->escapeUrl($review->getReviewId())
) ?>
<?php endif; ?>
</td>
<td data-th="<?= $escaper->escapeHtmlAttr(__('Review')) ?>" class="col description">
<?= $reviewHelper->getDetailHtml($review->getDetail()) ?>
</td>
<td data-th="<?= $escaper->escapeHtmlAttr(__('Actions')) ?>" class="col actions">
<a href="<?= $escaper->escapeUrl($block->getReviewUrl($review)) ?>" class="action more">
<span><?= $escaper->escapeHtml(__('See Details')) ?></span>
</a>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<?php if ($block->getToolbarHtml()): ?>
<div class="toolbar products-reviews-toolbar bottom">
<?= $block->getToolbarHtml() ?>
</div>
<?php endif; ?>
<?php else: ?>
<div class="message info empty"><span><?= $escaper->escapeHtml(__('You have submitted no reviews.')) ?></span></div>
<?php endif; ?>
<div class="actions-toolbar">
<div class="secondary">
<a class="action back" href="<?= $escaper->escapeUrl($block->getBackUrl()) ?>">
<span><?= $escaper->escapeHtml(__('Back')) ?></span>
</a>
</div>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment