重新编译js css

@@ -14722,6 +14722,22 @@ var address = require("js/order/address");
 
 var dialog = require("js/common/dialog");
 
+var accMul = function(arg1, arg2) {
+    var m = 0,
+ s1 = arg1.toString(),
+ s2 = arg2.toString();
+
+    try {
+        m += s1.split(".")[1].length
+    } catch (e) {
+    }
+    try {
+        m += s2.split(".")[1].length
+    } catch (e) {
+    }
+    return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
+}
+
 var Order = {
     /*业务数据(人民币)*/
     Data: {
@@ -14742,7 +14758,6 @@ var Order = {
             $cancel: $('.cancel', '.btn-group'),
             $total: $('em', '.to-play'),
             $tbody: $('table tbody', '.pay-wapper'),
-
             //请填写并核对一下信息
             $orderSelectionSave: $('.address-list h2 span'),
             $addAddress: $('.add-address'),
@@ -14757,16 +14772,16 @@ var Order = {
             $modityPayInfo: $('.modity-pay-info'),
             $payTotal: $('.play-total'),
             $toPay: $('.to-play em'),
-
             $redEnvelopes: $('.red-envelopes'),
             $useEnvelopes: $('.use-envelopes'),
             $hasEnvelopes: $('.has-envelopes span'),
-            $useEnvelopesInput: $('.use-envelopes').find('input')
+            $useEnvelopesInput: $('.use-envelopes').find('input'),
+            $expressFee: $('.express-fee')
         },
         init: function() {
             var e = this.e,
-                d = Order.Data,
-                c = Order.Common;
+                    d = Order.Data,
+                    c = Order.Common;
 
             //初始化产品价格(表格中的价格)
             e.$tbody.find('tr').each(function(index) {
@@ -14814,9 +14829,9 @@ var Order = {
             //请填写并核对一下信息
             e.$orderSelectionSave.click(function() {
                 var i = 0,
-                    $addressLi = $('.exist-address-list li'),
-                    liLen = $addressLi.length,
-                    notSelect = 0;
+                        $addressLi = $('.exist-address-list li'),
+                        liLen = $addressLi.length,
+                        notSelect = 0;
 
                 if (!$(this).attr('expand')) {
 
@@ -14911,16 +14926,16 @@ var Order = {
                 }
             });
         },
-
         //渲染价格明细
         render: function(data, tips) {
 
             // 下面这段是在服务端算价格
             var e = this.e,
-                i,
-                dArr = data.promotion_formula_list,
-                str = '',
-                isExpress = '';
+                    i,
+                    dArr = data.promotion_formula_list,
+                    packageList = data.package_list,
+                    str = '',
+                    isExpress = '';
 
             var tipsStr;
 
@@ -14949,16 +14964,16 @@ var Order = {
                 }
 
                 str += '<li class="' + isExpress + '">' +
-                    '<label>' + dArr[i].promotion + '</label>' +
-                    '<em>' + dArr[i].promotion_amount + '</em>' +
-                    '</li>';
+                        '<label>' + dArr[i].promotion + '</label>' +
+                        '<em>' + dArr[i].promotion_amount + '</em>' +
+                        '</li>';
             }
 
             e.$payTotal.html(str);
             e.$toPay.html((data.last_order_amount).toFixed(2));
 
             //有货币清零状态更新
-            $('#biprice').val(100 * data.use_yoho_coin);
+            $('#biprice').val(accMul(100, data.use_yoho_coin));
             if (~~data.use_yoho_coin === 0) {
                 $('.errbitip').text('');
             } else {
@@ -14977,6 +14992,20 @@ var Order = {
                 e.$useEnvelopesInput.prop('checked', false);
             }
             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);
+                });
+            }
         }
     },
     /*公共方法*/
@@ -15012,12 +15041,12 @@ var Order = {
             pan.find('dd').hide();
 
             /*if (pan.hasClass('play-juan-pan') && $('.juan-modify').length > 0) {
-                pan.find('dt').hide();
-            }
+             pan.find('dt').hide();
+             }
 
-            if (pan.hasClass('play-bi-pan') && $('.bi-modify').length > 0) {
-                pan.find('dt').hide();
-            }*/
+             if (pan.hasClass('play-bi-pan') && $('.bi-modify').length > 0) {
+             pan.find('dt').hide();
+             }*/
         },
         strFixed: function(str) {
             return parseFloat(str).toFixed(2);
@@ -15041,10 +15070,10 @@ var Order = {
         },
         init: function() {
             var e = this.e,
-                u = Order.UI,
-                options,
-                c = Order.Common,
-                envelopesVal;
+                    u = Order.UI,
+                    options,
+                    c = Order.Common,
+                    envelopesVal;
 
             function getSelectData(callback) {
 
@@ -15340,7 +15369,7 @@ var Order = {
                                     $('.play-juan').removeClass('is-select');
 
                                     $('#juancode').val('')
-                                        .siblings('input[name="juangroup"]').attr('checked', 'checked');
+                                            .siblings('input[name="juangroup"]').attr('checked', 'checked');
 
                                     // $('.use-envelopes input').attr('checked', 'checked');
                                     // $('.red-envelopes').addClass('active');
@@ -15365,7 +15394,7 @@ var Order = {
             e.$useEnvelopes.find('input').click(function() {
 
                 var $this = $(this),
-                    juanText;
+                        juanText;
 
                 e.$loading.show();
 
@@ -15468,10 +15497,10 @@ $(document).click(function() {
 //订单包裹左右切换
 function lunBo($pre, $next, $ul, $iWidth) {
     var i = 1,
-        j = 1;
+            j = 1;
 
     var iSpeed = 0,
-        isMoving = false;
+            isMoving = false;
 
     $pre.click(function() {
         if (isMoving) {