张田田 2 miesięcy temu
rodzic
commit
373a1e79d2
2 zmienionych plików z 25 dodań i 19 usunięć
  1. 1 1
      src/order/DispatchOrderPanel.vue
  2. 24 18
      src/service/SingleItemDetail.vue

+ 1 - 1
src/order/DispatchOrderPanel.vue

@@ -170,7 +170,7 @@ const gridOptions = reactive<VxeGridProps<Institution>>({
     { field: 'name', title: '机构名称' },
     { field: 'detailAddress', title: '地址' },
     { field: 'phone', title: '联系电话' },
-    { field: 'todayOrderQuantity', title: '当日线下订单数' },
+    { field: 'todayOrderQuantity', title: '当日订单数' },
   ],
   data: [],
   pagerConfig: {

+ 24 - 18
src/service/SingleItemDetail.vue

@@ -42,7 +42,9 @@ const expressTypeText: Record<string, string> = {
 };
 // 包裹数据
 const mockPackageItems = computed(() => {
-  return (props.data as any).sameExpress
+  console.log('props.data===', props.data);
+
+  return (props.data as any).sameExpress ?? []
 });
 // 商品状态映射 - 收货状态(实体商品使用)
 const receiptStatusText: Record<string, string> = {
@@ -144,26 +146,31 @@ const sellTypeText: Record<string, string> = {
       </vxe-table>
     </div>
     <!-- 物流信息和包裹内商品 实体商品才显示 sellType==='1'-->
-    <div class="info-section" v-if="data.sellType === '1' && data.receiptType !== null">
+    <div class="info-section" v-if="data.sellType === '1'">
       <!-- receiptType	收货方式 0-快递 1-线下取货 -->
       <!-- <h3 class="info-title">{{ data.receiptType === '0' ? '物流信息' : data.receiptType === '1' ? '线下取货' : '' }}</h3> -->
       <h3 class="info-title">物流信息</h3>
-      <div v-if="data.receiptType !== null">
-      <div class="info-content-wrapper" v-if="data.receiptStatus !== null">
+    
+      <div class="info-content-wrapper" v-if="data.receiptType">
         <!-- 物流信息 -->
         <div class="logistics-content" v-if="data.receiptType === '0'">
-          <div class="logistics-tracking">
-            <span class="tracking-number">{{ mockLogisticsData.trackingNumber }}</span>
-            <a @click="handleCopyTracking" class="copy-link">复制</a>
-          </div>
-          <div class="logistics-recipient">
-            <span class="receive-icon">收</span>
-            <span class="recipient-info">
-              {{ mockLogisticsData.recipientName
-                || '' }} {{ mockLogisticsData.recipientPhone || '' }} {{
-                mockLogisticsData.recipientAddress || '' }}
-            </span>
-          </div>
+          <template v-if="mockPackageItems.length > 0">
+            <div class="logistics-tracking">
+              <span class="tracking-number">{{ mockLogisticsData.trackingNumber }}</span>
+              <a @click="handleCopyTracking" class="copy-link">复制</a>
+            </div>
+            <div class="logistics-recipient">
+              <span class="receive-icon">收</span>
+              <span class="recipient-info">
+                {{ mockLogisticsData.recipientName
+                  || '' }} {{ mockLogisticsData.recipientPhone || '' }} {{
+                  mockLogisticsData.recipientAddress || '' }}
+              </span>
+            </div>
+          </template>
+          <template v-else>
+            暂无
+          </template>
         </div>
         <div class="logistics-content" v-if="data.receiptType === '1'">
           线下取货
@@ -197,10 +204,9 @@ const sellTypeText: Record<string, string> = {
         </div>
       </div>
       <div class="info-content-wrapper" v-else>
-        暂无信息
+        暂无
       </div>
     </div>
-    </div>
 
     <!-- 服务记录 线下服务才显示  1-实体商品 2-线下服务 3-线上权益-->
     <div class="info-section" v-if="data?.sellType === '2'">