Merge branch 'feature/orderShare' into release/5.8

@@ -68,11 +68,6 @@ const setDetailGoods = (list) => {
             reason: value.reason_name
         };
 
-        if (Number(value.real_pay_price) < Number(value.sales_price)) {
-            goods.price = transPrice(value.real_pay_price);// 显示分摊价
-            goods.linePrice = transPrice(value.sales_price); // 划线的价格
-        }
-
         resData.push(goods);
     });
 
@@ -211,8 +206,7 @@ const getOrderRefund = (orderCode, uid) => {
                     name: value.product_name,
                     color: value.factory_color_name,
                     size: value.size_name,
-                    lastPrice: value.last_price,
-                    price: transPrice(value.real_pay_price),
+                    price: transPrice(value.last_price),
                     skn: value.product_skn,
                     skc: value.product_skc,
                     sku: value.product_sku,
@@ -547,8 +541,7 @@ const getOrderExchange = (orderCode, uid) => {
                     name: value.product_name,
                     color: value.color_name,
                     size: value.size_name,
-                    lastPrice: value.last_price,
-                    price: value.real_pay_price,
+                    price: value.last_price,
                     skn: value.product_skn,
                     skc: value.product_skc,
                     sku: value.product_sku,

@@ -33,7 +33,7 @@
                                         <input type="hidden" value="{{skn}}" name="skn">
                                         <input type="hidden" value="{{skc}}" name="skc">
                                         <input type="hidden" value="{{sku}}" name="sku">
-                                        <input type="hidden" value="{{lastPrice}}" name="lastPrice">
+                                        <input type="hidden" value="{{price}}" name="price">
                                         <input type="hidden" value="{{goods_type_id}}" name="typeid">
                                         <input type="checkbox" checked="true">
                                     {{/unless}}
@@ -154,7 +154,7 @@
                     <table id="goods-table" class="goods-list-table">
                         <tr>
                             <th colspan="3">请选择退货商品</th>
-                            <th>成交价(元)</th>
+                            <th>单价(元)</th>
                             <th>退货原因</th>
                         </tr>
                         {{# goods}}
@@ -164,7 +164,7 @@
                                         <input type="hidden" value="{{skn}}" name="skn">
                                         <input type="hidden" value="{{skc}}" name="skc">
                                         <input type="hidden" value="{{sku}}" name="sku">
-                                        <input type="hidden" value="{{lastPrice}}" name="lastPrice">
+                                        <input type="hidden" value="{{price}}" name="price">
                                         <input type="hidden" value="{{goods_type_id}}" name="typeid">
                                         {{#unless isLimitSkn}}
                                             <input type="checkbox" checked="true">

@@ -105,9 +105,6 @@
                                     </td>
                                     <td>
                                         <p class="red">{{round price 2}}</p>
-                                        {{#if linePrice}}
-                                            <p class="line-through">{{round linePrice 2}}</p>
-                                        {{/if}}
                                     </td>
                                     <td>{{yoho_coin_cut_num}}</td>
                                     <td>1</td>

@@ -94,7 +94,7 @@ function getRefundCompute() {
             product_skc: $par.find('input[name="skc"]').val(),
             product_sku: $par.find('input[name="sku"]').val(),
             goods_type: $par.find('input[name="typeid"]').val(),
-            last_price: $par.find('input[name="lastPrice"]').val()
+            last_price: $par.find('input[name="price"]').val()
         };
 
         goods.push(goodsInfo);
@@ -420,7 +420,7 @@ function packGoogsList() {
                 product_skc: $par.find('input[name="skc"]').val(),
                 product_sku: $par.find('input[name="sku"]').val(),
                 goods_type: $par.find('input[name="typeid"]').val(),
-                last_price: $par.find('input[name="lastPrice"]').val(),
+                last_price: $par.find('input[name="price"]').val(),
                 reason: $par.find('.return-reason').val() * 1
             };