优化英文版订单

platform-admin/src/main/webapp/js/sys/tbcforderEnList.js

@@ -26,17 +26,18 @@ $(function () {
             {label: '手续费', name: 'fee', index: 'fee', hidden: true},
             {label: '优惠券ID', name: 'couponId', index: 'coupon_id', hidden: true},
             {label: '优惠券名称', name: 'couponTitle', index: 'coupon_title', hidden: true},
+            {label: 'email', name: 'email', index: 'email'},
             {
                 name: 'operation', index: 'operate', width: '160px',
                 formatter: function (value, grid, rows) {
                     if (grid.colModel.formatter.arguments[2].orderStatus == 10) {
                         return '<button onclick="closeList" style="display: inline-block;height: 30px; line-height: 25px; padding: 1px 18px; background-color: #49C8F2;font-size: 10px; ' +
                             '-webkit-border-radius: 2px;  border-radius: 6px; color: #fff;   cursor: pointer; border: 0;margin: 1px 6px;" class="orderdescbutton">order details' +
-                            '</button> ' ;
+                            '</button> ';
                     } else {
                         return '<button  onclick="closeList" style="display: inline-block;height: 30px; line-height: 25px; padding: 1px 18px; background-color: #49C8F2;font-size: 10px; ' +
                             '-webkit-border-radius: 2px;  border-radius: 6px; color: #fff;   cursor: pointer; border: 0;margin: 1px 6px;" class="orderdescbutton">order details' +
-                            '</button> ' ;
+                            '</button> ';
                         // } else if (grid.colModel.formatter.arguments[2].orderStatus == 40) {
                         //     return '<button  style="display: inline-block;height: 30px; line-height: 25px; padding: 1px 18px; background-color: #49C8F2;font-size: 10px; ' +
                         //         '-webkit-border-radius: 2px;  border-radius: 6px; color: #fff;   cursor: pointer; border: 0;margin: 1px 6px;" class="orderdescbutton">查看订单' +
@@ -398,26 +399,32 @@ let vm = new Vue({
             {
                 costtype: 'Goods together',
                 constnum: 1,
+            },
+            {
+                costtype: 'Total Quantity',
+                constnum: 1,
             }, {
-                costtype: 'freight charge',
+                costtype: 'Freight charge',
                 constnum: 1,
             }, {
-                costtype: 'taxes and dues',
+                costtype: 'Taxes and dues',
                 constnum: 1,
             }, {
-                costtype: 'service charge',
+                costtype: 'Service charge',
                 constnum: 1,
             }, {
-                costtype: 'discount coupon',
+                costtype: 'Discount coupon',
                 constnum: 1,
             }, {
-                costtype: 'cash coupon',
+                costtype: 'Cash coupon',
                 constnum: '',
-            }, {
-                costtype: 'special offer',
+            },
+            {
+                costtype: 'Full reduction',
                 constnum: 1,
-            }, {
-                costtype: 'actual payment',
+            },
+            {
+                costtype: 'Actual payment',
                 constnum: 1,
             },
         ],
@@ -792,13 +799,15 @@ let vm = new Vue({
                     })
 
                     vm.costData[0].constnum = r.orderBasicVo.itemsPrice;
-                    vm.costData[1].constnum = r.orderBasicVo.expressCost;
-                    vm.costData[2].constnum = r.orderBasicVo.tax;
-                    vm.costData[3].constnum = r.orderBasicVo.fee;
+                    vm.costData[1].constnum = r.orderBasicVo.num;
+                    vm.costData[2].constnum = r.orderBasicVo.expressCost;
+                    vm.costData[3].constnum = r.orderBasicVo.tax;
+                    vm.costData[4].constnum = r.orderBasicVo.fee;
                     // vm.costData[4].constnum = r.orderBasicVo.couponId;
-                    vm.costData[4].constnum = r.orderBasicVo.couponPrice;
+                    vm.costData[5].constnum = r.orderBasicVo.couponPrice;
                     vm.costData[6].constnum = r.orderBasicVo.couponTitle;
-                    vm.costData[7].constnum = r.orderBasicVo.realityPay;
+                    vm.costData[7].constnum = r.orderBasicVo.reduceAmount;
+                    vm.costData[8].constnum = r.orderBasicVo.realityPay;
                 }
             });
         },