fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 99a4ce76fb914bcbe04f93cd95b71b1baa13ebdf 1 parent 0b09d8f2

conpon-style-1

Inline Side-by-side
Showing 9 changed files with 119 additions and 61 deletions
... ... @@ -94,27 +94,27 @@
<a href="{{selectCouponUrl}}">
<span class="title">优惠券/优惠券码</span>
{{# coupon}}
{{#if couponName}}
<span class="used coupon-use" data-name="{{couponName}}">
{{couponName}}
<i class="iconfont">&#xe614;</i>
</span>
{{^}}
{{#unless isLimit}}
<span class="coupon-count">
{{#if count}}
{{count}}张可用
{{else}}
无可用
{{#if couponName}}
<span class="used coupon-use" data-name="{{couponName}}">
{{couponName}}
<i class="iconfont">&#xe614;</i>
</span>
{{^}}
{{#unless isLimit}}
<span class="coupon-count">
{{#if count}}
{{count}}张可用
{{else}}
无可用
{{/if}}
<i class="iconfont">&#xe614;</i>
</span>
{{/unless}}
<span class="not-used coupon-use">
{{#if isLimit}}该商品不可使用优惠券{{/if}}
<i class="iconfont">&#xe614;</i>
</span>
{{/if}}
<i class="iconfont">&#xe614;</i>
</span>
{{/unless}}
<span class="not-used coupon-use">
{{#if isLimit}}该商品不可使用优惠券{{/if}}
<i class="iconfont">&#xe614;</i>
</span>
{{/if}}
{{/coupon}}
</a>
</li>
... ...
... ... @@ -94,27 +94,23 @@
<a href="{{#if isLimit}}javascript:void(0);{{else}}/cart/index/new/selectCoupon{{/if}}">
<span class="title">优惠券/优惠券码</span>
{{# coupon}}
{{#if couponName}}
<span class="used coupon-use" data-name="{{couponName}}">
{{couponName}}
<i class="iconfont">&#xe614;</i>
</span>
{{^}}
{{#unless isLimit}}
<span class="coupon-count">
{{#if count}}
{{count}}张可用
{{else}}
无可用
{{#if couponName}}
<span class="used coupon-use" data-name="{{couponName}}">
{{couponName}}
<i class="iconfont">&#xe614;</i>
</span>
{{^}}
{{#unless isLimit}}
<span class="coupon-count">
{{#unless count}}无可用{{/unless}}
<i class="iconfont">&#xe614;</i>
</span>
{{/unless}}
<span class="not-used coupon-use">
{{#if isLimit}}该商品不可使用优惠券{{/if}}
<i class="iconfont">&#xe614;</i>
</span>
{{/if}}
<i class="iconfont">&#xe614;</i>
</span>
{{/unless}}
<span class="not-used coupon-use">
{{#if isLimit}}该商品不可使用优惠券{{/if}}
<i class="iconfont">&#xe614;</i>
</span>
{{/if}}
{{/coupon}}
</a>
</li>
... ...
<div class="yoho-page select-coupon-page my-coupon-page">
<form id="new-coupon" method="POST" action="">
<input type="text" name="couponCode" value="" placeholder="输入优惠券码">
<button type="submit" class="submit">确定</button>
<button type="submit" class="submit">兑换</button>
</form>
<div class="coupon-wrap">
<div id="coupon-list" class="coupon-list"></div>
... ...
... ... @@ -14,8 +14,8 @@ const domains = {
// api: 'http://192.168.103.59:8080/gateway',
// service: 'http://192.168.103.59:8080/gateway',
api: 'http://api-test3.yohops.com:9999/',
service: 'http://service-test3.yohops.com:9999/',
api: 'http://api-test2.yohops.com:9999/',
service: 'http://service-test2.yohops.com:9999/',
singleApi: 'http://api-test2.yohops.com:9999/',
global: 'http://global-test-soa.yohops.com:9999',
liveApi: 'http://testapi.live.yohops.com:9999/',
... ...
{{#coupons}}
{{^ notAvailable}}
<a class="employ-main" data-coupon-code="{{ couponCode}}" data-coupon-name="{{ couponDetailInfomation}}" href="javascript:void(0);">
<section class="coupon">
<div class="coupon-title">{{ couponDetailInfomation }}</div>
<div class="coupon-content">
<div class="content-left pull-left">
<div class="value">{{ couponValue }}</div>
<div class="requirement">使用条件</div>
</div>
<div class="content-middle pull-left">{{ couponValidity}}</div>
<div class="content-right pull-left">
<i class="iconfont checkbox icon-radio"></i>
</div>
</div>
</section>
{{/ notAvailable}}
{{/coupons}}
{{!--
<a class="employ-main" data-coupon-code="{{ couponCode}}" data-coupon-name="{{ couponDetailInfomation}}" href="javascript:void(0);">
<span>{{ couponValue}}</span>
<p class="coupon-name">{{ couponDetailInfomation}}</p>
<p>有效期：{{ couponValidity}}</p>
</a>
{{/ notAvailable}}
{{/coupons}}
<a class="not-use" href="javascript:void(0);">不使用任何优惠券</a>
\ No newline at end of file
</a> --}}
\ No newline at end of file
... ...
... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2017-06-23 11:43:44
* @Last Modified by: Targaryen
* @Last Modified time: 2017-07-21 11:06:22
* @Last Modified time: 2017-07-21 14:41:50
*/
require('cart/select-coupon.page.css');
const qs = require('yoho-qs');
... ... @@ -23,6 +23,7 @@ let $newCoupon = $('#new-coupon'),
let winH = $(window).height();
require('common');
require('cart/cartbuynow/select-coupon');
function fixedLayOut() {
let $null = $('.null'),
... ...
/*
* @Author: Targaryen
* @Date: 2017-06-27 17:18:56
* @Last Modified by: Targaryen
*/
$('.select-coupon-page').css('min-height', function() {
return $(window).height();
});
... ...
... ... @@ -21,6 +21,7 @@ let $newCoupon = $('#new-coupon'),
let winH = $(window).height();
require('common');
require('cart/cartbuynow/select-coupon');
function fixedLayOut() {
let $null = $('.null'),
... ...
... ... @@ -7,9 +7,58 @@
height: 0;
}
$couponRadius: 8px;
$rosyPink: #f06a6b;
$backgroudColor: #f2f2f2;
$fontColor: #444;
.select-coupon-page {
margin-top: 30px;
margin-bottom: 30px;
background-color: $backgroudColor;
padding-top: 40px;
.coupon-list {
.coupon {
border-radius: $couponRadius;
background-color: #fff;
margin: 30px;
height: 212px;
.coupon-title {
border-top-left-radius: $couponRadius;
border-top-right-radius: $couponRadius;
background-color: $rosyPink;
color: $backgroudColor;
font-size: 24px;
padding: 10px;
}
.coupon-content {
border-top: 4px dotted $rosyPink;
margin-top: -2px;
padding: 20px;
.content-left {
width: 120px;
border-right: 2px solid $fontColor;
}
.content-left > .value {
width: 100%;
text-align: center;
font-size: 48px;
color: $fontColor;
}
.content-middle {
width: 350px;
}
.content-right {
width: 40px;
}
}
}
}
#new-coupon {
margin-bottom: 30px;
... ... @@ -38,16 +87,6 @@
}
}
.coupon-list {
.employ-main:first-child {
margin-top: 0;
}
.employ-main:last-child {
margin-bottom: 0;
}
}
.not-use {
display: block;
width: 560px;
... ...