|
|
@@ -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
|
|
|
+ })
|
|
|
});
|
|
|
|
|
|
},
|