Merge branch 'master' of http://47.99.244.21:9999/qinjianhui/factory_front

src/components/ShipmentOrderDetail.vue

@@ -90,7 +90,7 @@
             <div class="order-list-expand_item_info_title">
             <div class="order-list-expand_item_info_title">
               <span class="order-list-expand_item_label">店铺单号:</span>
               <span class="order-list-expand_item_label">店铺单号:</span>
               <span class="order-list-expand_item_value">{{
               <span class="order-list-expand_item_value">{{
-                item.shop_number || '--'
+                item.product.shop_number || '--'
               }}</span>
               }}</span>
             </div>
             </div>
            
            

src/views/AccountStatementNote.vue

@@ -548,7 +548,6 @@ import { DetailForm, ShipmentOrderDetailData } from '@/types/api/deliveryNote'
 import shipmentOrderDetailInfo from '@/components/ShipmentOrderDetail.vue'
 import shipmentOrderDetailInfo from '@/components/ShipmentOrderDetail.vue'
 import ImageView from '@/components/ImageView.vue'
 import ImageView from '@/components/ImageView.vue'
 import { showConfirm } from '@/utils/ui'
 import { showConfirm } from '@/utils/ui'
-import { filePath } from '@/api/axios'
 // import { getUserMarkList } from '@/api/auth.ts'
 // import { getUserMarkList } from '@/api/auth.ts'
 
 
 interface Tree {
 interface Tree {
@@ -861,7 +860,7 @@ const exportExcel = async () => {
   const ids = selections.value.map((el) => el.id).join(',')
   const ids = selections.value.map((el) => el.id).join(',')
   try {
   try {
     const res = await exportExcelApi(ids)
     const res = await exportExcelApi(ids)
-    window.open(filePath + res.data)
+    window.open(res.data)
   } catch (e) {
   } catch (e) {
     console.error(e)
     console.error(e)
   }
   }