xdd 1 nedēļu atpakaļ
vecāks
revīzija
5de574becd

+ 7 - 0
src/api/live/liveOrder.js

@@ -140,6 +140,13 @@ export function getByOrderId(orderId){
     method: 'get'
   })
 }
+
+export function getExpress(orderId){
+  return request({
+    url: '/live/liveOrder/express/'+orderId,
+    method: 'get'
+  })
+}
 export function bindCustomer(data) {
   return request({
     url: '/live/liveOrder/bindCustomer',

+ 9 - 9
src/views/live/liveOrder/liveOrderDetails.vue

@@ -90,17 +90,17 @@
         style="width: 100%;margin-top: 20px" >
         <el-table-column label="物流公司编码" width="150" align="center">
           <template slot-scope="scope">
-            <p>{{scope.row.deliveryCode}}</p>
+            <p>{{scope.row.deliverSn}}</p>
           </template>
         </el-table-column>
         <el-table-column label="物流公司名称" width="300" align="center">
           <template slot-scope="scope">
-            <p>{{scope.row.deliveryName}}</p>
+            <p>{{scope.row.deliverName}}</p>
           </template>
         </el-table-column>
         <el-table-column label="物流单号" width="300" align="center">
           <template slot-scope="scope">
-            <p>{{scope.row.deliverySn}}</p>
+            <p>{{scope.row.deliverId}}</p>
           </template>
         </el-table-column>
         <el-table-column label="物流状态" width="300" align="center">
@@ -186,7 +186,7 @@
       </div>
     </div>
 
-    <div class="contentx" v-if="item!=null" style="padding-bottom: 70px;">
+    <div class="contentx" v-if="payments!=null" style="padding-bottom: 70px;">
       <div class="desct">
         支付信息
       </div>
@@ -205,7 +205,7 @@
     </el-table>
     </div>
 
-    <div class="contentx" v-if="item!=null" style="padding-bottom: 70px;">
+    <div class="contentx" v-if="logs!=null" style="padding-bottom: 70px;">
 
       <div class="desct">
         操作信息
@@ -226,7 +226,7 @@
     </el-table>
 </div>
 
-    <div class="contentx" v-if="item!=null" style="padding-bottom: 70px;">
+    <div class="contentx" v-if="tuiMoneyLogs!=null" style="padding-bottom: 70px;">
 
       <div class="desct">
         分佣信息
@@ -864,13 +864,13 @@ export default {
         this.msgForm.userId=response.data.userId;
         this.msgForm.followDoctorId=response.data.followDoctorId;
         this.getlistOrderitem(this.item.orderId);
-        getByOrderId(this.item.orderId).then(response => {
-          this.deliverList = [response.data]
+        getExpress(this.item.orderId).then(response => {
+          this.deliverList = response.data;
           console.log(this.deliverList)
         })
 
         getOrderPayments(this.item.orderId).then(response => {
-          this.payments = response.data;
+          this.payments = response.payments;
         });
       });