对接多个数据源订单接口和订单商品清单接口

src/api/myOrder.js

@@ -8,6 +8,15 @@ export function getMyOrderList(params) {
     loading: true
   })
 }
+// 多选订单列表
+export function getMoreMyOrderList(params) {
+  return fetch({
+    url: '/CompanyOrderLife/queryOrder',
+    method: 'post',
+    data: params,
+    loading: true
+  })
+}
 // 获取订单详情
 export function getMyOrderDetail(params) {
   return fetch({

src/views/myOrder/detail/goodsInfo.vue

 <template>
   <div class="goods-info">
-    <div v-if="detailData.goodsInfos.length !== 0" class="goods-info-details">
+    <div v-if="detailData.length !== 0" class="goods-info-details">
       <!-- <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
         <van-list
           v-model="loading"
@@ -8,7 +8,7 @@
           finished-text="没有更多了"
           @load="onLoad"
         > -->
-        <div class="list" v-for="(item, index) in detailData.goodsInfos" :key="index">
+        <div class="list" v-for="(item, index) in detailData" :key="index">
           <!-- <goods-info-detail :item="item"></goods-info-detail> -->
           <goods-info-list-item :item="item"></goods-info-list-item>
         </div>
@@ -20,9 +20,9 @@
         <!-- </van-list>
       </van-pull-refresh> -->
     </div>
-    <van-empty v-if="detailData.goodsInfos.length === 0" description="暂无更多数据" />
+    <van-empty v-if="detailData.length === 0" description="暂无更多数据" />
      <div class="goods-sum">
-      <div class="sum-number-detail">共 {{detailData.goodsInfos.length}} 个商品</div>
+      <div class="sum-number-detail">共 {{detailData.length}} 个商品</div>
       <div class="sum-amount">金额总计：<span style="font-size: 16PX;">￥{{orderTotalAmount}}</span></div>
       
     </div>
@@ -56,10 +56,7 @@ export default {
         copy: require("@/assets/img/u533.svg"),
       },
       orderItem: this.$route.query,
-      detailData: {
-        goodsInfos: [],
-        orderTotalAmount: '0'
-      },
+      detailData: [],
       moreSearchInfo: {
         goodsCode: '', // 商品编号
         goodsName: '', // 商品名称
@@ -68,14 +65,20 @@ export default {
       }
     };
   },
+  props: {
+    totalAmount: {
+      type: String,
+      default: '0.00'
+    }
+  },
   computed: {
     // 总价格
     orderTotalAmount () {
-      if (this.detailData.orderTotalAmount) {
-        return AmountNumFormat(this.detailData.orderTotalAmount)
-      } else {
-        return '0.00'
-      }
+      // if (this.detailData.orderTotalAmount) {
+      //   return AmountNumFormat(this.detailData.orderTotalAmount)
+      // } else {
+        return this.orderItem.orderTotalAmount
+      // }
     }
   },
   mounted() {
@@ -174,13 +177,10 @@ export default {
         'supplierId': []
       }
       getMyOrderDetail(params).then(res => {
-        this.detailData = {
-          goodsInfos: [],
-          orderTotalAmount: '0'
-        }
+        this.detailData = []
         if (res.code === 200 && res.data && res.data.code === '00000' &&
-          res.data.entity && res.data.entity.orderList && res.data.entity.orderList.length > 0) {
-          this.detailData = res.data.entity.orderList[0]
+          res.data.entity && res.data.entity.detailList && res.data.entity.detailList.length > 0) {
+          this.detailData = res.data.entity.detailList
           // let array = []
           // for (var i = 0; i < 10; i++) {
           //   array.push(this.detailData.goodsInfos[0])

src/views/myOrder/myOrderList.vue

@@ -64,7 +64,7 @@
 
 <script>
 // 引入接口
-import { getMyOrderList } from '@/api/myOrder'
+import { getMyOrderList, getMoreMyOrderList } from '@/api/myOrder'
 import orderListItem from './orderListItem.vue'
 import {getFormateDate} from '@/utils/common'
 import { valid } from 'semver'
@@ -101,7 +101,7 @@ export default {
       type: Object,
       default: () => {
         return {
-          supplier: '', // 供应商
+          supplier: {}, // 供应商
           consignor: [], // 货主
           goods: '', // 商品
           client: '', // 客户
@@ -198,23 +198,30 @@ export default {
         'sourceDb': 'SHYY', // 数据来源
         'sourceOrderNo': '', // 来源订单号(网上订单号)
         'sourceSystem': '', // 订单来源 来源订单号和订单来源必须同时不为空
-        'userSiteId': '1372122312286081024',
         'supplierId': [
         ] // 供应商(部门)编码
       }
-      // let data2 = {"clientID":["3168"],"goodsCode":"","goodsDesc":"","goodsId":"","goodsName":"","goodsSpec":"","isInoivce":"","isWeb":"","manufacturer":"","mdmClientCode":"","order":"","orderDate":"","orderId":"19958468","orderNo":"","orderStatusCode":"110","orderType":"","pageNum":1,"pageSize":10,"shippingAdress":"","sort":"","sourceDb":"SHYY","sourceOrderNo":"","sourceSystem":"","supplierId":["305"],"startDate":"","endDate":"","userSiteId":"1372122450039607296"}
-      getMyOrderList(data).then(rt => {
-        if (rt.data.code === '00000') {
+      let dict = {
+        'list': [
+          data
+        ],
+        'endDate': _this.moreSearchInfo.time.end,  // 结束时间
+        'startDate': _this.moreSearchInfo.time.start, // 开始时间
+        'pageNum': _this.currentPage,
+        'pageSize': _this.pageSize
+      }
+      getMoreMyOrderList(dict).then(rt => {
+        if (rt.code === '1') {
           if (_this.isRefreshing) {
-            _this.orderList = rt.data.entity.orderList
+            _this.orderList = rt.data
           } else if (rt.data || rt.data.length > 0) {
-            _this.orderList = _this.orderList.concat(rt.data.entity.orderList)
+            _this.orderList = _this.orderList.concat(rt.data)
           }
           // 重置刷新提示
           _this.isRefreshing = false
           // 重置加载更多提示
           _this.isLoading = false
-          if (rt.data.entity.orderList.length < 10) {
+          if (rt.data.length < 10) {
             _this.finished = true
           } else {
             // 加载成功后下一页自增1