xdd 1 주 전
부모
커밋
40e4a05380
3개의 변경된 파일15개의 추가작업 그리고 6개의 파일을 삭제
  1. 7 0
      src/api/live/liveOrder.js
  2. 1 1
      src/views/live/liveAfteraSales/index.vue
  3. 7 5
      src/views/live/liveOrder/liveOrderDetails.vue

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

@@ -17,6 +17,13 @@ export function getLiveOrder(orderId) {
   })
 }
 
+// 推广金额
+export function tuiMoneyLogs(orderId){
+  return request({
+    url: '/live/liveOrder/tuiMoneyLogs?orderId='+orderId,
+    method: 'get',
+  })
+}
 // 获取订单支付记录
 export function getOrderPayments(orderId){
   return request({

+ 1 - 1
src/views/live/liveAfteraSales/index.vue

@@ -293,7 +293,7 @@ export default {
     this.getDicts("store_order_delivery_status").then((response) => {
       this.deliveryStatusOptions = response.data;
     });
-    this.getDicts("store_order_status").then((response) => {
+    this.getDicts("live_order_status").then((response) => {
       this.orderStatusOptions = response.data;
     });
 

+ 7 - 5
src/views/live/liveOrder/liveOrderDetails.vue

@@ -173,8 +173,8 @@
       </el-tooltip>
       <el-descriptions :column="3" border  >
         <el-descriptions-item label="商品合计"  ><span v-if="item!=null">{{item.totalPrice}}</span></el-descriptions-item>
-        <el-descriptions-item label="应付金额"><span v-if="item.totalPrice!=null">{{item.totalPrice}}({{item.totalPrice}})</span></el-descriptions-item>
-        <el-descriptions-item label="运费"><span v-if="item.payDelivery!=null">{{item.payDelivery}}({{item.payDelivery}})</span></el-descriptions-item>
+        <el-descriptions-item label="应付金额"><span v-if="item.totalPrice!=null">{{item.totalPrice}}</span></el-descriptions-item>
+        <el-descriptions-item label="运费"><span v-if="item.payDelivery!=null">{{item.payDelivery}}</span></el-descriptions-item>
         <el-descriptions-item label="优惠券"  ><span v-if="item.discountMoney!=null"/>{{item.discountMoney}}</el-descriptions-item>
         <el-descriptions-item label="积分抵扣" >  <span v-if="item!=null">{{item.payIntegral}}</span>  </el-descriptions-item>
         <el-descriptions-item label="实付金额" >  <span v-if="item!=null">{{item.payMoney}}</span>  </el-descriptions-item>
@@ -355,7 +355,7 @@ import {
   listOrderitem,
   tuiOrder,
   refundOrderMoney,
-  editDeliveryId, finishOrder, getOrderExpress, getOrderPayments, getOrderLog
+  editDeliveryId, finishOrder, getOrderExpress, getOrderPayments, getOrderLog, tuiMoneyLogs
 } from "@/api/live/liveOrder";
 import {getStoreOrderLive} from "@/api/store/storeOrder";
 
@@ -858,9 +858,8 @@ export default {
       this.tuiMoneyLogs=null;
       getLiveOrder(orderId).then(response => {
         this.item = response.data;
+        console.log(this.tuiMoneyLogs)
         this.tuiMoneyLogs = response.tuiMoneyLogs;
-        // this.getlogList(orderId);
-        // this.getPayment(orderId);
         this.msgForm.userId=response.data.userId;
         this.msgForm.followDoctorId=response.data.followDoctorId;
         this.getlistOrderitem(this.item.orderId);
@@ -877,6 +876,9 @@ export default {
           this.logs = response.logs
         });
 
+        tuiMoneyLogs(this.item.orderId).then(response => {
+          this.tuiMoneyLogs = response.data
+        })
       });
 
     },