fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit 648507c03c7f8ae77c743efdae6fd82113f949be 2 parents c33a5d82 5097decf

merge new_customer

Inline Side-by-side
Showing 9 changed files with 373 additions and 74 deletions
No preview for this file type
@@ -306,8 +306,8 @@ function phoneHidden(phone) { @@ -306,8 +306,8 @@ function phoneHidden(phone) {
306 return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2'); 306 return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
307 } 307 }
308 308
309 -if ($('.user-name').text().length === 11) {  
310 - $('.user-name').html(phoneHidden($('.user-name').text())); 309 +if ($footer.find('.user-name').text().length === 11) {
  310 + $footer.find('.user-name').html(phoneHidden($footer.find('.user-name').text()));
311 } 311 }
312 312
313 //暴露公共接口 313 //暴露公共接口
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -288,8 +288,8 @@ function phoneHidden(phone) { @@ -288,8 +288,8 @@ function phoneHidden(phone) {
288 return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2'); 288 return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
289 } 289 }
290 290
291 -if ($('.user-name').text().length === 11) {  
292 - $('.user-name').html(phoneHidden($('.user-name').text())); 291 +if ($footer.find('.user-name').text().length === 11) {
  292 + $footer.find('.user-name').html(phoneHidden($footer.find('.user-name').text()));
293 } 293 }
294 294
295 //暴露公共接口 295 //暴露公共接口
  1 +.coupon-area .banner-top {
  2 + float: left;
  3 +}
  4 +.just-img{
  5 + width: 100%;
  6 + float: left;
  7 + margin: 20rem / $pxConvertRem 0;
  8 +}
  9 +.coupon-floor {
  10 + float: left;
  11 + width: 100%;
  12 + .floor-title {
  13 + background-color: #fff;
  14 + text-align: center;
  15 + height: 96rem / $pxConvertRem;
  16 + line-height: 96rem / $pxConvertRem;
  17 + font-size: 30rem / $pxConvertRem;
  18 + }
  19 +
  20 + .floor-main {
  21 + height: 180rem / $pxConvertRem;
  22 + width: 100%;
  23 + background-size: 100%;
  24 + background-repeat: no-repeat;
  25 + padding: 10rem / $pxConvertRem 30rem / $pxConvertRem;
  26 + box-sizing: border-box;
  27 + float: left;
  28 +
  29 + .main-left {
  30 + float: left;
  31 + width: 467rem / $pxConvertRem;
  32 + height: 160rem / $pxConvertRem;
  33 + }
  34 +
  35 + .main-right-receive, .main-right-use, .main-right-go {
  36 + float: right;
  37 + width: 113rem / $pxConvertRem;
  38 + height: 160rem / $pxConvertRem;
  39 + position: relative;
  40 +
  41 + span {
  42 + background-repeat: no-repeat;
  43 + background-size: contain;
  44 +
  45 + &.on-receive {
  46 + position: absolute;
  47 + left: 50%;
  48 + top: 50rem / $pxConvertRem;
  49 + margin-left: -26rem / $pxConvertRem;
  50 + display: inline-block;
  51 + width: 52rem / $pxConvertRem;
  52 + height: 54rem / $pxConvertRem;
  53 + background-image: image-url('coupon/click-txt.png');
  54 + }
  55 +
  56 + &.received {
  57 + width: 113rem / $pxConvertRem;
  58 + height: 132rem / $pxConvertRem;
  59 + background-image: image-url('coupon/received.png');
  60 + position: absolute;
  61 + top: 0;
  62 + right: 0;
  63 + }
  64 +
  65 + &.zero {
  66 + width: 111rem / $pxConvertRem;
  67 + height: 132rem / $pxConvertRem;
  68 + background-image: image-url('coupon/zero.png');
  69 + position: absolute;
  70 + top: 0;
  71 + right: 0;
  72 + }
  73 + }
  74 + }
  75 + }
  76 +}
  77 +
  78 +.floor-mask {
  79 + position: absolute;
  80 + top: 0;
  81 + left: 0;
  82 + right: 0;
  83 + bottom: 0;
  84 + background-color: rgba(0, 0, 0, .5);
  85 + display: none;
  86 + z-index: 9;
  87 +}
  88 +
  89 +.floor-message {
  90 + position: fixed;
  91 + top: 50%;
  92 + left: 50%;
  93 + width: 550rem/$pxConvertRem;
  94 + height: 250rem/$pxConvertRem;
  95 + margin-left: -275rem/$pxConvertRem;
  96 + margin-top: -125rem/$pxConvertRem;
  97 + z-index: 10;
  98 + background-color: rgba(250, 250, 250, .92);
  99 + display: none;
  100 + border-radius: 10px;
  101 +
  102 + .coupon-message-content {
  103 + border-bottom: 1px solid rgb(197, 197, 197);
  104 + height: 160rem/$pxConvertRem;
  105 + text-align: center;
  106 + line-height: 160rem/$pxConvertRem;
  107 + font-size: 28rem/$pxConvertRem;
  108 + }
  109 +
  110 + .coupon-message-op {
  111 + height: 90rem/$pxConvertRem;
  112 + text-align: center;
  113 + line-height: 90rem/$pxConvertRem;
  114 + font-size: 32rem/$pxConvertRem;
  115 + color: rgb(223, 98, 112);
  116 + }
  117 +}
  118 +
  119 +.floor-tooltip{
  120 + position: fixed;
  121 + top: 50%;
  122 + left: 50%;
  123 + width: 220rem/$pxConvertRem;
  124 + height: 140rem/$pxConvertRem;
  125 + margin-left: -110rem/$pxConvertRem;
  126 + margin-top: -70rem/$pxConvertRem;
  127 + z-index: 11;
  128 + background-color: rgba(60, 60, 60, .7);
  129 + display: none;
  130 + border-radius: 8rem/$pxConvertRem;
  131 + color: #fff;
  132 +
  133 + .icon-box{
  134 + height: 84rem/$pxConvertRem;
  135 + line-height: 84rem/$pxConvertRem;
  136 + text-align: center;
  137 + }
  138 +
  139 + .icon-msg{
  140 + height: 56rem/$pxConvertRem;
  141 + text-align: center;
  142 + }
  143 +}
  1 +.coupon-area .banner-top {
  2 + float: left;
  3 +}
  4 +.just-img{
  5 + width: 100%;
  6 + float: left;
  7 + margin: 20rem / $pxConvertRem 0;
  8 +}
  9 +.coupon-floor {
  10 + float: left;
  11 + width: 100%;
  12 + .floor-title {
  13 + background-color: #fff;
  14 + text-align: center;
  15 + height: 96rem / $pxConvertRem;
  16 + line-height: 96rem / $pxConvertRem;
  17 + font-size: 30rem / $pxConvertRem;
  18 + }
  19 +
  20 + .floor-main {
  21 + height: 180rem / $pxConvertRem;
  22 + width: 100%;
  23 + background-size: 100%;
  24 + background-repeat: no-repeat;
  25 + padding: 10rem / $pxConvertRem 30rem / $pxConvertRem;
  26 + box-sizing: border-box;
  27 + float: left;
  28 +
  29 + .main-left {
  30 + float: left;
  31 + width: 467rem / $pxConvertRem;
  32 + height: 160rem / $pxConvertRem;
  33 + }
  34 +
  35 + .main-right-receive, .main-right-use, .main-right-go {
  36 + float: right;
  37 + width: 113rem / $pxConvertRem;
  38 + height: 160rem / $pxConvertRem;
  39 + position: relative;
  40 +
  41 + span {
  42 + background-repeat: no-repeat;
  43 + background-size: contain;
  44 +
  45 + &.on-receive {
  46 + position: absolute;
  47 + left: 50%;
  48 + top: 50rem / $pxConvertRem;
  49 + margin-left: -26rem / $pxConvertRem;
  50 + display: inline-block;
  51 + width: 52rem / $pxConvertRem;
  52 + height: 54rem / $pxConvertRem;
  53 + background-image: image-url('coupon/click-txt.png');
  54 + }
  55 +
  56 + &.received {
  57 + width: 113rem / $pxConvertRem;
  58 + height: 132rem / $pxConvertRem;
  59 + background-image: image-url('coupon/received.png');
  60 + position: absolute;
  61 + top: 0;
  62 + right: 0;
  63 + }
  64 +
  65 + &.zero {
  66 + width: 111rem / $pxConvertRem;
  67 + height: 132rem / $pxConvertRem;
  68 + background-image: image-url('coupon/zero.png');
  69 + position: absolute;
  70 + top: 0;
  71 + right: 0;
  72 + }
  73 + }
  74 + }
  75 + }
  76 +}
  77 +
  78 +.floor-mask {
  79 + position: absolute;
  80 + top: 0;
  81 + left: 0;
  82 + right: 0;
  83 + bottom: 0;
  84 + background-color: rgba(0, 0, 0, .5);
  85 + display: none;
  86 + z-index: 9;
  87 +}
  88 +
  89 +.floor-message {
  90 + position: fixed;
  91 + top: 50%;
  92 + left: 50%;
  93 + width: 550rem/$pxConvertRem;
  94 + height: 250rem/$pxConvertRem;
  95 + margin-left: -275rem/$pxConvertRem;
  96 + margin-top: -125rem/$pxConvertRem;
  97 + z-index: 10;
  98 + background-color: rgba(250, 250, 250, .92);
  99 + display: none;
  100 + border-radius: 10px;
  101 +
  102 + .coupon-message-content {
  103 + border-bottom: 1px solid rgb(197, 197, 197);
  104 + height: 160rem/$pxConvertRem;
  105 + text-align: center;
  106 + line-height: 160rem/$pxConvertRem;
  107 + font-size: 28rem/$pxConvertRem;
  108 + }
  109 +
  110 + .coupon-message-op {
  111 + height: 90rem/$pxConvertRem;
  112 + text-align: center;
  113 + line-height: 90rem/$pxConvertRem;
  114 + font-size: 32rem/$pxConvertRem;
  115 + color: rgb(223, 98, 112);
  116 + }
  117 +}
  118 +
  119 +.floor-tooltip{
  120 + position: fixed;
  121 + top: 50%;
  122 + left: 50%;
  123 + width: 220rem/$pxConvertRem;
  124 + height: 140rem/$pxConvertRem;
  125 + margin-left: -110rem/$pxConvertRem;
  126 + margin-top: -70rem/$pxConvertRem;
  127 + z-index: 11;
  128 + background-color: rgba(60, 60, 60, .7);
  129 + display: none;
  130 + border-radius: 8rem/$pxConvertRem;
  131 + color: #fff;
  132 +
  133 + .icon-box{
  134 + height: 84rem/$pxConvertRem;
  135 + line-height: 84rem/$pxConvertRem;
  136 + text-align: center;
  137 + }
  138 +
  139 + .icon-msg{
  140 + height: 56rem/$pxConvertRem;
  141 + text-align: center;
  142 + }
  143 +}
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="order-ensure-page yoho-page"> 2 <div class="order-ensure-page yoho-page">
3 {{# orderEnsure}} 3 {{# orderEnsure}}
4 - <a class="address-wrap block" data-id="{{addressId}}" data-support="{{isSupport}}" href="/cart/index/selectAddress">  
5 - <p class="infos">  
6 - 收货地址  
7 - <span class="per-info">{{name}} {{phoneNum}}</span>  
8 - <span class="address">{{addressInfo}}</span>  
9 - </p>  
10 - <span class="iconfont">&#xe614;</span>  
11 - </a>  
12 - 4 + {{#if addressInfo}}
  5 + <div class="address block address-wrap {{#if pageHeader.boys}} boys{{/if}}{{#if pageHeader.girls}} girls{{/if}}{{#if pageHeader.kids}} kids{{/if}}{{#if pageHeader.lifeStyle}} life-style{{/if}}" data-id ="{{addressId}}">
  6 + <div class="info">
  7 + <span class="info-name">{{name}}</span>
  8 + <span class="info-phone">{{phoneNum}}</span>
  9 + <a href="/cart/index/selectAddress"><span class="info-address">{{addressInfo}}</span></a>
  10 + <i class="iconfont">&#xe637;</i>
  11 + </div>
  12 + <a class="rest" href="/cart/index/selectAddress">其他地址<span class="iconfont">&#xe614;</span></a>
  13 + </div>
  14 + {{^}}
  15 + <div class="address block address-wrap not-address">
  16 + <i class="iconfont">&#xe637;</i>
  17 + <a class="choose" href="/cart/index/selectAddress">请选择收货地址<span class="iconfont">&#xe614;</span></a>
  18 + </div>
  19 + {{/if}}
13 <section class="dispatch block"> 20 <section class="dispatch block">
14 - <div class="sub-block">  
15 - <h3 class="title">配送方式</h3>  
16 - <ul class="dispatch-mode clearfix"> 21 + <div class="sub-block payment-type">
  22 + <h3>
  23 + <p>支付方式</p>
  24 + {{#each paymentWay}}
  25 + {{#if recommend}}<span>{{name}}</span>{{/if}}
  26 + {{/each}}
  27 + <i class="iconfont down">&#xe616;</i>
  28 + <i class="iconfont hide up">&#xe615;</i>
  29 + </h3>
  30 + <ul>
  31 + {{#each paymentWay}}
  32 + {{#if isSupport}}
  33 + <li {{#if recommend}}class="chosed"{{/if}}>
  34 + <span>{{name}}</span>
  35 + <i class="right iconfont {{#if recommend}}icon-cb-radio{{else}}icon-radio{{/if}}" data-id="{{paymentType}}"></i>
  36 + </li>
  37 + {{/if}}
  38 + {{/each}}
  39 + </ul>
  40 + </div>
  41 + <div class="sub-block delivery-id">
  42 + <h3>
  43 + <p>配送方式</p>
  44 + {{#each dispatchMode}}
  45 + {{#if isSelected}}<span>{{name}}：运费¥{{cost}}</span>{{/if}}
  46 + {{/each}}
  47 + <i class="iconfont down">&#xe616;</i>
  48 + <i class="iconfont hide up">&#xe615;</i>
  49 + </h3>
  50 + <ul class="dispatch-mode">
17 {{#each dispatchMode}} 51 {{#each dispatchMode}}
18 - <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">{{name}}</li> 52 + <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
  53 + <span>{{name}}：运费¥{{cost}}</span>
  54 + <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}"></i>
  55 + </li>
19 {{/each}} 56 {{/each}}
20 </ul> 57 </ul>
21 </div> 58 </div>
22 -  
23 - <div class="sub-block">  
24 - <h3 class="title">送货时间</h3>  
25 - <ul class="dispatch-time clearfix"> 59 + <div class="sub-block dispatch-time">
  60 + <h3>
  61 + <p>送货时间</p>
26 {{#each dispatchTime}} 62 {{#each dispatchTime}}
27 - <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">{{name}}</li> 63 + {{#if isSelected}}<span>{{name}}</span>{{/if}}
  64 + {{/each}}
  65 + <i class="iconfont down">&#xe616;</i>
  66 + <i class="iconfont hide up">&#xe615;</i>
  67 + </h3>
  68 + <ul>
  69 + {{#each dispatchTime}}
  70 + <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
  71 + <span>{{name}}</span>
  72 + <i class="right iconfont radio {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}" ></i>
  73 + </li>
28 {{/each}} 74 {{/each}}
29 </ul> 75 </ul>
30 </div> 76 </div>
31 </section> 77 </section>
32 -  
33 - <section class="block">  
34 - <h3 class="title">商品</h3>  
35 - <div class="goods"> 78 + <section class="block" style="margin-bottom: 0;">
36 {{#each goods}} 79 {{#each goods}}
37 {{> me/order/good}} 80 {{> me/order/good}}
38 {{/each}} 81 {{/each}}
39 - </div>  
40 </section> 82 </section>
  83 + <div class="goods-num">共{{num}}件商品 合计<span>¥{{goodsPrice}}</span></div>
41 84
42 <section class="block"> 85 <section class="block">
43 <ul class="sale-invoice"> 86 <ul class="sale-invoice">
@@ -46,10 +89,6 @@ @@ -46,10 +89,6 @@
46 <a href="{{#if isLimit}}javascript:void(0);{{else}}/cart/index/selectCoupon{{/if}}"> 89 <a href="{{#if isLimit}}javascript:void(0);{{else}}/cart/index/selectCoupon{{/if}}">
47 <span class="title">优惠券</span> 90 <span class="title">优惠券</span>
48 {{# coupon}} 91 {{# coupon}}
49 - <!--<span class="coupon-count">  
50 - {{count}}张可用  
51 - </span>-->  
52 -  
53 {{#if couponName}} 92 {{#if couponName}}
54 <span class="used coupon-use" data-name="{{couponName}}"> 93 <span class="used coupon-use" data-name="{{couponName}}">
55 {{couponName}} 94 {{couponName}}
@@ -74,13 +113,13 @@ @@ -74,13 +113,13 @@
74 113
75 {{#if useYohoCoin}} 114 {{#if useYohoCoin}}
76 <span class="coin-check"> 115 <span class="coin-check">
77 - <em>- ¥ {{useYohoCoin}}</em>  
78 - <i class="iconfont checkbox icon-cb-checked"></i> 116 + <!-- <em>- ¥ {{useYohoCoin}}</em> -->
  117 + <i class="iconfont checkbox icon-cb-radio"></i>
79 </span> 118 </span>
80 {{else}} 119 {{else}}
81 <span class="coin-check"> 120 <span class="coin-check">
82 - <em style="display: none;">- ¥ {{useYohoCoin}}</em>  
83 - <i class="iconfont checkbox icon-checkbox"></i> 121 + <!-- <em style="display: none;">- ¥ {{useYohoCoin}}</em> -->
  122 + <i class="iconfont checkbox icon-radio"></i>
84 </span> 123 </span>
85 {{/if}} 124 {{/if}}
86 {{^}} 125 {{^}}
@@ -93,7 +132,7 @@ @@ -93,7 +132,7 @@
93 {{#if invoice}} 132 {{#if invoice}}
94 <li class="invoice {{#if needInvoice}}focus{{/if}}"> 133 <li class="invoice {{#if needInvoice}}focus{{/if}}">
95 <span class="title">发票</span> 134 <span class="title">发票</span>
96 - <span class="iconfont checkbox {{#if needInvoice}}icon-cb-checked{{else}}icon-checkbox{{/if}}"></span> 135 + <span class="iconfont checkbox {{#if needInvoice}}icon-cb-radio{{else}}icon-radio{{/if}}"></span>
97 <form id="invoice"> 136 <form id="invoice">
98 <input type="text" name="invoice-title" value="{{invoiceText}}" maxlength="30" placeholder="发票抬头"> 137 <input type="text" name="invoice-title" value="{{invoiceText}}" maxlength="30" placeholder="发票抬头">
99 <label> 138 <label>
@@ -113,50 +152,24 @@ @@ -113,50 +152,24 @@
113 <input type="text" name="msg" value="{{msg}}" maxlength="40" placeholder="留言"> 152 <input type="text" name="msg" value="{{msg}}" maxlength="40" placeholder="留言">
114 </form> 153 </form>
115 </section> 154 </section>
116 -  
117 - <section class="price-cal block"> 155 + <section class="price-cal block">
118 <ul class="total"> 156 <ul class="total">
119 {{#cartPayData}} 157 {{#cartPayData}}
120 <li> 158 <li>
121 - <span>{{promotion}}</span>  
122 - &nbsp;&nbsp;{{promotion_amount}} 159 + <p>{{promotion}}</p>
  160 + <span>{{promotion_amount}}</span>
123 </li> 161 </li>
124 {{/cartPayData}} 162 {{/cartPayData}}
125 - <li class="cost">  
126 - 应付金额： <em>¥{{price}}</em>  
127 - </li>  
128 </ul> 163 </ul>
  164 + <div class="price-cost">
  165 + 实付金额
  166 + <span>¥{{price}}</span>
  167 + </div>
129 </section> 168 </section>
130 -  
131 - <ul class="pay-mode">  
132 - {{# paymentWay}}  
133 - {{#if isSupport}}  
134 - <li class="{{#if recommend}}default{{/if}}" data-pay-type="{{paymentType}}" data-pay-id="{{id}}">  
135 - <span class="iconfont">  
136 - {{#if recommend}}  
137 - &#xe62f;  
138 - {{else}}  
139 - &#xe62e;  
140 - {{/if}}  
141 - </span>  
142 - {{name}}  
143 - </li>  
144 - {{/if}}  
145 - {{/ paymentWay}}  
146 - </ul> 169 + <div class="bill">
  170 + 您需要支付：<span>¥{{price}}</span>
  171 + <a href="#">提交订单</a>
  172 + </div>
147 {{/ orderEnsure}} 173 {{/ orderEnsure}}
148 </div> 174 </div>
149 -<script id="tmpl-price" type="text/tmpl">  
150 - <ul class="total">  
151 - \{{#cartPayData}}  
152 - <li>  
153 - <span>\{{promotion}}</span>  
154 - &nbsp;&nbsp;\{{promotion_amount}}  
155 - </li>  
156 - \{{/cartPayData}}  
157 - <li class="cost">  
158 - 应付金额： <em>¥\{{price}}</em>  
159 - </li>  
160 - </ul>  
161 -</script>  
162 -{{> layout/footer}} 175 +{{> layout/footer}}