Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuy into release/4.4

@@ -123,7 +123,7 @@
                                     </ul>
                                     </ul>
                                 </div>
                                 </div>
                             </li>
                             </li>
-                            
+
                             <li>
                             <li>
                               {{#if supportDeliveryPay}}
                               {{#if supportDeliveryPay}}
                                 <input value="2" {{#if deliveryPay.checked}}checked{{/if}} class="radio {{#if deliveryPay.checked}}checked{{/if}}" name="pay-type" type="radio" id="" data-pay="{{deliveryPay.paymentId}}"/>
                                 <input value="2" {{#if deliveryPay.checked}}checked{{/if}} class="radio {{#if deliveryPay.checked}}checked{{/if}}" name="pay-type" type="radio" id="" data-pay="{{deliveryPay.paymentId}}"/>
@@ -147,7 +147,7 @@
                                 <label for="">{{desc}}</label>
                                 <label for="">{{desc}}</label>
                             </li>
                             </li>
                             {{/each}}
                             {{/each}}
-                            
+
                             <li class="pay-dashed-hr pay-type-tips">声明：我们会努力按照您指定的时间配送，但因为天气、交通等各类因素影响，您的订单有可能会有延误现象，敬请谅解！</li>
                             <li class="pay-dashed-hr pay-type-tips">声明：我们会努力按照您指定的时间配送，但因为天气、交通等各类因素影响，您的订单有可能会有延误现象，敬请谅解！</li>
 
 
                             <li>
                             <li>
@@ -180,7 +180,7 @@
         </div>
         </div>
     </div>
     </div>
     <!--   订单提示-->
     <!--   订单提示-->
-	
+
 	{{#if packages}}
 	{{#if packages}}
 	<div id="differentOrder" class="differentOrder">
 	<div id="differentOrder" class="differentOrder">
 		<p class="warn">
 		<p class="warn">
@@ -202,7 +202,7 @@
 						<li >
 						<li >
 							<a href={{link}}>
 							<a href={{link}}>
 								<img src={{src}}/>
 								<img src={{src}}/>
-								
+
 							</a>
 							</a>
 							{{#if goodsType}}
 							{{#if goodsType}}
 							<p class="{{classname}}" >{{goodsType}}</p>
 							<p class="{{classname}}" >{{goodsType}}</p>
@@ -214,13 +214,13 @@
 				<p class="next">
 				<p class="next">
 				</p>
 				</p>
 				{{#if fee}}
 				{{#if fee}}
-				    <p>运费：￥{{fee}}元(原价{{orign}}元,优惠{{count}}元)</p>
+				    <p class="express-fee">运费：￥{{fee}}元(原价{{orign}}元,优惠{{count}}元)</p>
 				{{else}}
 				{{else}}
-					<p>运费：￥0.00元</p>
+					<p class="express-fee">运费：￥0.00元</p>
 				{{/if}}
 				{{/if}}
 			</div>
 			</div>
 			{{/each}}
 			{{/each}}
-			
+
 		</div>
 		</div>
 	</div>
 	</div>
 	{{/if}}
 	{{/if}}
@@ -310,7 +310,7 @@
                                 <label for="isPPY">是</label>
                                 <label for="isPPY">是</label>
                                 <input name="isPP" id="isPPN" type="radio" value="N">
                                 <input name="isPP" id="isPPN" type="radio" value="N">
                                 <label for="isPPN">否</label>
                                 <label for="isPPN">否</label>
-                                （如：送朋友的商品可不打印价格哦！) 
+                                （如：送朋友的商品可不打印价格哦！)
                             </p>
                             </p>
                         </div>
                         </div>
                     </dd>
                     </dd>
@@ -384,9 +384,9 @@
                 </div>
                 </div>
                 {{/if}}
                 {{/if}}
             </div>
             </div>
-        </div>    
         </div>
         </div>
-        
+        </div>
+
         <div class="to-play">
         <div class="to-play">
             <p>您需要实际支付金额：<em>{{lastOrderAmount}}</em>元</p>
             <p>您需要实际支付金额：<em>{{lastOrderAmount}}</em>元</p>
             <div class="btn-group clearfix">
             <div class="btn-group clearfix">
@@ -397,4 +397,4 @@
 {{/ orderEnsure}}
 {{/ orderEnsure}}
 <div class="loading"><span></span>请稍后...</div>
 <div class="loading"><span></span>请稍后...</div>
 </div>
 </div>
-{{> layout/footer}}
+{{> layout/footer}}

@@ -62,7 +62,8 @@ var Order = {
             $redEnvelopes: $('.red-envelopes'),
             $redEnvelopes: $('.red-envelopes'),
             $useEnvelopes: $('.use-envelopes'),
             $useEnvelopes: $('.use-envelopes'),
             $hasEnvelopes: $('.has-envelopes span'),
             $hasEnvelopes: $('.has-envelopes span'),
-            $useEnvelopesInput: $('.use-envelopes').find('input')
+            $useEnvelopesInput: $('.use-envelopes').find('input'),
+            $expressFee: $('.express-fee')
         },
         },
         init: function() {
         init: function() {
             var e = this.e,
             var e = this.e,
@@ -219,6 +220,7 @@ var Order = {
             var e = this.e,
             var e = this.e,
                     i,
                     i,
                     dArr = data.promotion_formula_list,
                     dArr = data.promotion_formula_list,
+                    packageList = data.package_list,
                     str = '',
                     str = '',
                     isExpress = '';
                     isExpress = '';
 
 
@@ -277,6 +279,20 @@ var Order = {
                 e.$useEnvelopesInput.prop('checked', false);
                 e.$useEnvelopesInput.prop('checked', false);
             }
             }
             e.$hasEnvelopes.html('￥' + envelopesVal.toFixed(2));
             e.$hasEnvelopes.html('￥' + envelopesVal.toFixed(2));
+
+            if (packageList) {
+                e.$expressFee.each(function(index, expressCost) {
+                    var orignCost = packageList[index].shopping_orig_cost,
+                        disCount = packageList[index].shopping_cut_cost,
+                        realCost = packageList[index].shopping_cost;
+
+                    var cost = parseInt(orignCost) === 0 ?
+                        '运费：￥0.00元' :
+                        '运费：￥' + realCost + '元(原价' + orignCost + '元,优惠' + disCount + ')元';
+
+                    $(expressCost).text(cost);
+                });
+            }
         }
         }
     },
     },
     /*公共方法*/
     /*公共方法*/