Skip to content

Commit

Permalink
更新
Browse files Browse the repository at this point in the history
  • Loading branch information
root authored and root committed May 12, 2017
1 parent 4261d3f commit 63898c6
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 25 deletions.
50 changes: 41 additions & 9 deletions app/apphtml5/theme/base/html5/assets/css/fec.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ a{font-size:0.8em;}
height: 44px;
line-height: 44px;
min-width: 15px;
padding: 0 10px;
padding: 0px;
text-align:center;
}


Expand Down Expand Up @@ -508,25 +509,56 @@ a.btn-remove {


#discount-coupon-form h2{font-size:0.6rem;}
.cart-collaterals{padding:0.2rem 0.4rem;}
.cart-collaterals{padding:0.2rem 0.4rem;min-height:17.5rem;}
.cart_cost{margin-top:1rem;}
.cart_cost .row.no-gutter .col-80{text-align:right;padding-right:1rem;}
.cart_cost .row.no-gutter{
padding-top: 0.2rem;
}

a.express_paypal{
background: #ffc63e;
border-color: #ffc63e;
display: block;
height: 2.17rem;
line-height: 2.17rem;
overflow: hidden;
padding: 0 0.83rem;
text-align: center;
text-overflow: ellipsis;
text-transform: capitalize;
white-space: nowrap;
padding:0 0.5rem;
width:100%;
border-radius: 0.17rem;
}
a.express_paypal img{max-height:70px;height:100%;width:100%;max-width:260px;}

.cart-totals{margin:1rem 0}


.btn-proceed-checkout{
background-color: #f90;
border-color: #f90;
display: block;
font-size:0.7rem;
height: 2.17rem;
line-height: 2.17rem;
overflow: hidden;
padding: 0 0.83rem;
text-align: center;
text-overflow: ellipsis;
text-transform: capitalize;
white-space: nowrap;
padding:0 0.5rem;
width:100%;
border-radius: 0.17rem;
color:#fff;
}

.proceed_to_checkout .row.no-gutter .col-50{padding:0.2rem}








.header_logo img{width:5rem; margin-top: 0.68rem;}



Expand Down
Binary file added app/apphtml5/theme/base/html5/assets/img/pay.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/apphtml5/theme/base/html5/catalog/product/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<span class="average_rating"><?= Yii::$service->page->translate->__('Average rating'); ?> :</span>
<span class="review_star review_star_<?= $reviw_rate_star_average ?>" style="font-weight:bold;" itemprop="average"></span>

<a rel="nofollow" href="#text-reviews">
<a external rel="nofollow" href="<?= Yii::$service->url->getUrl('catalog/reviewproduct/lists',['spu'=>$spu,'_id'=>$_id]); ?>">
(<span itemprop="count"><?= $review_count ?> <?= Yii::$service->page->translate->__('reviews'); ?></span>)
</a>
</span>
Expand Down
34 changes: 20 additions & 14 deletions app/apphtml5/theme/base/html5/checkout/cart/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
<?php foreach($cart_info['products'] as $product_one){ ?>
<div class="row">
<div class="col-20">
<a href="<?= $product_one['url'] ?>" title="<?= $product_one['name'] ?>" class="product-image">
<a external href="<?= $product_one['url'] ?>" title="<?= $product_one['name'] ?>" class="product-image">
<img src="<?= Yii::$service->product->image->getResize($product_one['image'],[150,150],false) ?>" alt="<?= $product_one['name'] ?>" width="75" height="75">
</a>
</div>
<div class="col-80">
<h2 class="product-name">
<a href="<?= $product_one['url'] ?>"><?= $product_one['name'] ?></a>
<a external href="<?= $product_one['url'] ?>"><?= $product_one['name'] ?></a>
</h2>
<?php if(is_array($product_one['custom_option_info'])){ ?>
<ul class="options">
Expand All @@ -40,12 +40,12 @@
<span class="price"><?= $currency_info['symbol']; ?><?= Format::price($product_one['product_price']); ?></span>
</span>
<div class="cart_qty">
<a href="javascript:void(0)" class="cartqtydown changeitemqty" rel="<?= $product_one['item_id']; ?>" num="<?= $product_one['qty']; ?>">-</a>
<a externalhref="javascript:void(0)" class="cartqtydown changeitemqty" rel="<?= $product_one['item_id']; ?>" num="<?= $product_one['qty']; ?>">-</a>
<input name="cart[qty]" size="4" title="Qty" class="input-text qty" rel="<?= $product_one['item_id']; ?>" maxlength="12" value="<?= $product_one['qty']; ?>">
<a href="javascript:void(0)" class="cartqtyup changeitemqty" rel="<?= $product_one['item_id']; ?>" num="<?= $product_one['qty']; ?>">+</a>
<a externalhref="javascript:void(0)" class="cartqtyup changeitemqty" rel="<?= $product_one['item_id']; ?>" num="<?= $product_one['qty']; ?>">+</a>
<div class="clear"></div>
</div>
<a href="javascript:void(0)" rel="<?= $product_one['item_id']; ?>" title="Remove item" class="btn-remove btn-remove2"><span class="icon icon-remove"></span></a>
<a externalhref="javascript:void(0)" rel="<?= $product_one['item_id']; ?>" title="Remove item" class="btn-remove btn-remove2"><span class="icon icon-remove"></span></a>

</div>
</div>
Expand All @@ -67,7 +67,7 @@
<div class="ui-input-text ui-body-inherit ui-corner-all ui-shadow-inset"><input style="color:#777;" class="input-text" id="coupon_code" name="coupon_code" value=""></div>
</div>
<div class="buttons-coupon">
<a data-role="button" href="javascript:void(0)" onclick="cartcouponsubmit()" class="submitbutton ui-link ui-btn ui-shadow ui-corner-all" role="button"><span><span>Add Coupon</span></span> </a>
<a external data-role="button" href="javascript:void(0)" onclick="cartcouponsubmit()" class="submitbutton ui-link ui-btn ui-shadow ui-corner-all" role="button"><span><span>Add Coupon</span></span> </a>

</div>
</div>
Expand All @@ -86,7 +86,7 @@
</div>

<div class="row no-gutter">
<div class="col-80"><?= Yii::$service->page->translate->__('Shipping Cost');?> : </td></div>
<div class="col-80"><?= Yii::$service->page->translate->__('Shipping Cost');?> : </div>
<div class="col-20"><?= $currency_info['symbol']; ?><?= Format::price($cart_info['shipping_cost']); ?></div>
</div>

Expand All @@ -105,12 +105,18 @@

<div class="proceed_to_checkout">

<button onclick="location.href='<?= Yii::$service->url->getUrl('checkout/onepage'); ?>'" type="button" title="Proceed to Checkout" class="button btn-proceed-checkout btn-checkout"><span><span><?= Yii::$service->page->translate->__('Proceed to Pay');?></span></span></button>
<div class="row no-gutter">
<div class="col-50">
<button onclick="location.href='<?= Yii::$service->url->getUrl('checkout/onepage'); ?>'" type="button" title="Proceed to Checkout" class="button btn-proceed-checkout btn-checkout"><span><span><?= Yii::$service->page->translate->__('Proceed to Pay');?></span></span></button>

<span class="or">- <?= Yii::$service->page->translate->__('OR');?> - </span>
<a class="express_paypal" href="<?= Yii::$service->url->getUrl('payment/paypal/express/start'); ?>">

</a>
</div>
<div class="col-50">
<a external class="express_paypal" href="<?= Yii::$service->url->getUrl('payment/paypal/express/start'); ?>">
<img src="<?= Yii::$service->image->getImgUrl('/images/pay.png') ?>" />
</a>

</div>
</div>
</div>
</div>
<div class="clear"></div>
Expand All @@ -121,12 +127,12 @@
<?php }else{ ?>
<div class="empty_cart">
<?php
$param = ['urlB' => '<a rel="nofollow" href="'.Yii::$service->url->getUrl('customer/account/login').'">','urlE' =>'</a>'];
$param = ['urlB' => '<a external rel="nofollow" href="'.Yii::$service->url->getUrl('customer/account/login').'">','urlE' =>'</a>'];
?>

<div id="empty_cart_info">
<?= Yii::$service->page->translate->__('Your Shopping Cart is empty');?>
<a href="<?= Yii::$service->url->homeUrl(); ?>"><?= Yii::$service->page->translate->__('Start shopping now!');?></a>
<a external href="<?= Yii::$service->url->homeUrl(); ?>"><?= Yii::$service->page->translate->__('Start shopping now!');?></a>
<br>
<?= Yii::$service->page->translate->__('Please {urlB}log in{urlE} to view the products you have previously added to your Shopping Cart.',$param);?>
</div>
Expand Down
6 changes: 5 additions & 1 deletion app/apphtml5/theme/base/html5/widgets/header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
?>
<header class="bar bar-nav">
<a class="icon icon-menu pull-left open-panel" data-panel="#panel-left-menu"></a>
<a href="<?= Yii::$service->url->homeUrl(); ?>" external><h1 class='title'>FecShop</h1></a>
<a href="<?= Yii::$service->url->homeUrl(); ?>" external>
<h1 class='title header_logo'>
<img src="<?= Yii::$service->image->getImgUrl('/custom/logo.png','appfront') ?>" />
</h1>
</a>
<div class="pull-right">
<a style="padding-right:0.4rem" class="icon icon-me open-panel" data-panel="#panel-left-account"></a>
<a style="padding-right:0.4rem" class="icon icon-cart" href="<?= Yii::$service->url->getUrl('checkout/cart'); ?>" external></a>
Expand Down

0 comments on commit 63898c6

Please sign in to comment.