FIX: 账户流水查看订单详情

src/api/store/storeOrder.js

@@ -63,7 +63,7 @@ export function getStoreOrder(id) {
 }
 export function getStoreOrderLive(id,payTypeCode) {
   return request({
-    url: '/store/storeOrder/' + id+'/'+payTypeCode,
+    url: '/store/storeOrder/v2/' + id+'/'+payTypeCode,
     method: 'get'
   })
 }

src/views/company/companyMoneyLogs/index.vue

@@ -163,9 +163,9 @@
     </el-dialog>
     <el-drawer
      size="75%"
-      :title="show.title" :visible.sync="show.open"
-      >
-      <product-order  ref="order" />
+      :title="show.title" :visible.sync="show.open">
+      <product-order  ref="order" v-if="orderType == 0"/>
+      <liveOrderDetails  ref="Details" v-if="orderType == 1"/>
     </el-drawer>
   </div>
 </template>
@@ -174,12 +174,13 @@
 import { listCompanyMoneyLogs, getCompanyMoneyLogs, delCompanyMoneyLogs, addCompanyMoneyLogs, updateCompanyMoneyLogs, exportCompanyMoneyLogs } from "@/api/company/companyMoneyLogs";
 import { getCompanyList } from "@/api/company/company";
 import productOrder from "../../store/components/productOrder";
+import liveOrderDetails from "@/views/live/liveOrder/liveOrderDetails.vue";
 export default {
-  components: { productOrder},
+  components: {liveOrderDetails, productOrder},
   name: "CompanyMoneyLogs",
   data() {
     return {
-
+      orderType: 0,
       show:{
         open:false,
         title:"订单详情"
@@ -228,7 +229,6 @@ export default {
     });
     getCompanyList().then(response => {
       this.companys = response.data;
-
     });
     this.getList();
   },
@@ -237,9 +237,13 @@ export default {
       this.show.open=true;
       const orderId = row.businessId ;
       const payTypeCode = row.payTypeCode;
-
+      this.orderType = payTypeCode;
       setTimeout(() => {
-        this.$refs.order.getOrderLive(orderId,payTypeCode);
+        if(0 == payTypeCode) {
+          this.$refs.order.getOrder(orderId);
+        } else if(1 == payTypeCode) {
+          this.$refs.Details.getOrderLive(orderId)
+        }
       }, 500);
     },
     /** 查询企业账户记录列表 */

src/views/live/liveOrder/liveOrderDetails.vue

@@ -273,6 +273,7 @@ import {
   refundOrderMoney,
   editDeliveryId, finishOrder
 } from "@/api/live/liveOrder";
+import {getStoreOrderLive} from "@/api/store/storeOrder";
 
 
 export default {
@@ -433,6 +434,12 @@ export default {
   },
   methods: {
 
+    getOrderLive(orderId){
+      getLiveOrder(orderId).then(response => {
+        this.item=response.data
+      });
+      this.getlistOrderitem(orderId);
+    },
     followMsg(row){
       const userId = this.item.userId;
       const followDoctorId =this.item.followDoctorId;

src/views/store/components/productOrder.vue

@@ -948,27 +948,7 @@ export default {
         });
 
         this.getExpressList();
-     },
-    getOrderLive(orderId,payTypeCode){
-      this.orderId=orderId;
-      this.certificates = null;
-      getStoreOrderLive(orderId,payTypeCode).then(response => {
-        this.order = response.order;
-        if(response.order.certificates != null){
-          this.certificates = response.order.certificates;
-        }
-        if(response.order.status != null){
-          this.orderStatus = response.order.status;
-        }
-        this.user = response.user;
-        this.logs = response.logs;
-        this.items = response.items;
-        this.payments=response.payments;
-        this.tuiMoneyLogs=response.tuiMoneyLogs;
-      });
-
-      this.getExpressList();
-    }
+     }
   }
 };
 </script>