From d5a2f0ba24944f198a83da3df8f08a45f58d27ec Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 26 Mar 2026 10:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/index/components/detail.vue | 126 +++++++++++++++-----
 1 file changed, 94 insertions(+), 32 deletions(-)

diff --git a/src/views/order/index/components/detail.vue b/src/views/order/index/components/detail.vue
index 7ebb59a..9c6313e 100644
--- a/src/views/order/index/components/detail.vue
+++ b/src/views/order/index/components/detail.vue
@@ -33,7 +33,7 @@
           <div class="item">
             <div class="t">订单类型</div>
             <div class="b">
-              {{ sendTypeFilter(detail.sendType) }}
+              {{ sendTypeFilter(detail.dineMode) }}
             </div>
           </div>
         </div>
@@ -46,12 +46,12 @@
           </div>
           <div class="item">
             <div class="t">下单时间</div>
-            <div class="b">{{ timeFilter(detail.createdAt) }}</div>
+            <div class="b">{{ timeFilter(detail.createTime) }}</div>
           </div>
           <div class="item">
             <div class="t">支付时间</div>
             <div class="b">
-              {{ timeFilter(detail.createdAt) }}
+              {{ timeFilter(detail.paidTime) }}
             </div>
           </div>
         </div>
@@ -81,9 +81,9 @@
               <div>优惠券抵扣：￥{{ detail.fullCouponDiscountAmount }}</div>
             </div>
             <div class="row">
-              <div>满减活动：￥{{ detail.discountActAmount || '-' }}</div>
-              <div>新客立减：￥{{ detail.newCustomerDiscountAmount || '-' }}</div>
-              <div>会员折扣：￥{{ detail.vipDiscountAmount || '-' }}</div>
+              <div>满减活动：￥{{ detail.discountActAmount || "-" }}</div>
+              <div>新客立减：￥{{ detail.newCustomerDiscountAmount || "-" }}</div>
+              <div>会员折扣：￥{{ detail.vipDiscountAmount || "-" }}</div>
             </div>
             <div class="row">
               <div>退单金额：￥{{ detail.refundAmount }}</div>
@@ -93,8 +93,13 @@
               <div>
                 实收金额：
                 <span style="color: red">￥{{ detail.payAmount }}</span>
-                <el-button v-if="detail.status != 'unpaid' && detail.refundAmount < detail.payAmount" size="small"
-                  type="danger" class="u-m-l-10" @click="tuikuan()">
+                <el-button
+                  v-if="detail.status != 'unpaid' && detail.refundAmount < detail.payAmount"
+                  size="small"
+                  type="danger"
+                  class="u-m-l-10"
+                  @click="tuikuan()"
+                >
                   <span>退款</span>
                 </el-button>
               </div>
@@ -121,29 +126,44 @@
           <div style="margin-bottom: 16px; font-size: 16px">商品信息</div>
           <template v-for="(item, index) in detail.detailMap" :key="index">
             <h4>第{{ index }}次下单</h4>
-            <el-table :data="item" :ref="'refTable' + index" @select-all="tableSelectAll($event, index)">
+            <el-table
+              :data="item"
+              :ref="'refTable' + index"
+              @select-all="tableSelectAll($event, index)"
+            >
               <!-- <el-table-column type="selection" width="55" /> -->
               <el-table-column label="数量" type="selection">
                 <template v-slot="scope">
                   <div v-if="detail.status == 'unpaid'">
-                    <el-checkbox v-if="scope.row.num - scope.row.returnNum > 0" v-model="scope.row.checked" />
+                    <el-checkbox
+                      v-if="scope.row.num - scope.row.returnNum > 0"
+                      v-model="scope.row.checked"
+                    />
                   </div>
                   <div v-else>
-                    <el-checkbox v-if="scope.row.num - scope.row.refundNum > 0" v-model="scope.row.checked" />
+                    <el-checkbox
+                      v-if="scope.row.num - scope.row.refundNum > 0"
+                      v-model="scope.row.checked"
+                    />
                   </div>
                 </template>
               </el-table-column>
               <el-table-column label="商品" width="150">
                 <template v-slot="scope">
                   <div class="shop_info">
-                    <el-image :src="scope.row.productImg" style="width: 40px; height: 40px"></el-image>
+                    <el-image
+                      :src="scope.row.productImg"
+                      style="width: 40px; height: 40px"
+                    ></el-image>
                     <div class="info">
                       <span :class="[scope.row.isVip == 1 ? 'colorStyle' : '']">
                         {{ scope.row.productName }}
                       </span>
                       <span style="color: #999">{{ scope.row.productSkuName }}</span>
                       <div>
-                        <el-tag v-if="scope.row.isTimeDiscount" type="danger" disable-transitions>限时折扣</el-tag>
+                        <el-tag v-if="scope.row.isTimeDiscount" type="danger" disable-transitions>
+                          限时折扣
+                        </el-tag>
                       </div>
                     </div>
                   </div>
@@ -167,17 +187,32 @@
               <el-table-column label="实付">
                 <template v-slot="scope">￥{{ scope.row.payAmount }}</template>
               </el-table-column>
-              <el-table-column v-if="detail.status == 'unpaid'" label="可退菜数量" align="center" width="130px">
+              <el-table-column
+                v-if="detail.status == 'unpaid'"
+                label="可退菜数量"
+                align="center"
+                width="130px"
+              >
                 <template v-slot="scope">
-                  <el-input-number v-if="scope.row.checked" :min="0" style="width: 100px" v-model="scope.row.selNumber"
-                    :max="scope.row.num - scope.row.returnNum"></el-input-number>
+                  <el-input-number
+                    v-if="scope.row.checked"
+                    :min="0"
+                    style="width: 100px"
+                    v-model="scope.row.selNumber"
+                    :max="scope.row.num - scope.row.returnNum"
+                  ></el-input-number>
                   <span class="" v-else>{{ scope.row.num - scope.row.returnNum }}</span>
                 </template>
               </el-table-column>
               <el-table-column v-else label="可退款数量" align="center" width="130px">
                 <template v-slot="scope">
-                  <el-input-number v-if="scope.row.checked" :min="0" style="width: 100px" v-model="scope.row.selNumber"
-                    :max="scope.row.num - scope.row.refundNum - scope.row.returnNum"></el-input-number>
+                  <el-input-number
+                    v-if="scope.row.checked"
+                    :min="0"
+                    style="width: 100px"
+                    v-model="scope.row.selNumber"
+                    :max="scope.row.num - scope.row.refundNum - scope.row.returnNum"
+                  ></el-input-number>
                   <span class="" v-else>
                     {{ scope.row.num - scope.row.refundNum - scope.row.returnNum }}
                   </span>
@@ -192,13 +227,23 @@
               <el-table-column label="操作" fixed="right">
                 <template v-slot="scope">
                   <template v-if="detail.status != 'unpaid'">
-                    <el-button v-if="canTuikuan(scope.row)" link size="small" @click="tuikuan(scope.row)">
+                    <el-button
+                      v-if="canTuikuan(scope.row)"
+                      link
+                      size="small"
+                      @click="tuikuan(scope.row)"
+                    >
                       <span>退款</span>
                     </el-button>
                     <span class="color-999" v-if="scope.row.status == 'refund'">已退款</span>
                   </template>
                   <template v-if="detail.status == 'unpaid'">
-                    <el-button v-if="canTuicai(scope.row)" link size="small" @click="tuicai(scope.row)">
+                    <el-button
+                      v-if="canTuicai(scope.row)"
+                      link
+                      size="small"
+                      @click="tuicai(scope.row)"
+                    >
                       <span>退菜</span>
                     </el-button>
                     <span class="color-999" v-else>已退菜</span>
@@ -208,25 +253,41 @@
             </el-table>
           </template>
           <!-- 退款 -->
-          <div class="u-p-20 u-flex u-row-right" v-if="
-            detail.status !== 'refund' &&
-            detail.status !== 'unpaid' &&
-            detail.status !== 'cancelled'
-          ">
-            <el-checkbox v-model="allSelected" @change="allSelectedChange" label="全选"></el-checkbox>
+          <div
+            class="u-p-20 u-flex u-row-right"
+            v-if="
+              detail.status !== 'refund' &&
+              detail.status !== 'unpaid' &&
+              detail.status !== 'cancelled'
+            "
+          >
+            <el-checkbox
+              v-model="allSelected"
+              @change="allSelectedChange"
+              label="全选"
+            ></el-checkbox>
             <el-button type="danger" class="u-m-l-20" @click.stop="tuikuan('all')">退款</el-button>
           </div>
           <!-- 退菜 -->
           <div class="u-p-20 u-flex u-row-right" v-if="detail.status == 'unpaid'">
-            <el-checkbox v-model="allSelected" @change="allSelectedChange" label="全选"></el-checkbox>
+            <el-checkbox
+              v-model="allSelected"
+              @change="allSelectedChange"
+              label="全选"
+            ></el-checkbox>
             <el-button type="danger" class="u-m-l-20" @click.stop="tuicai('all')">退菜</el-button>
           </div>
         </div>
       </div>
     </el-drawer>
     <!-- 退款 -->
-    <return-money :modal="false" ref="refReturnMoney" :max="selGoods.num" :goods="selGoods"
-      @confirm="refReturnMoneyConfirm"></return-money>
+    <return-money
+      :modal="false"
+      ref="refReturnMoney"
+      :max="selGoods.num"
+      :goods="selGoods"
+      @confirm="refReturnMoneyConfirm"
+    ></return-money>
     <!-- 退菜 -->
     <order-return-cart ref="refReturnCart" @confirm="refReturnCartConfirm"></order-return-cart>
   </div>
@@ -330,8 +391,8 @@ export default {
       if (!payType) {
         return "";
       }
-      console.log(payType.replace("_pay", ""));
-      return returnOptionsLabel("payType", payType.replace("_pay", ""));
+      console.log(payType);
+      return returnOptionsLabel("payType", payType);
     },
     to2(n) {
       return Number(n).toFixed(2);
@@ -345,7 +406,8 @@ export default {
     },
     sendTypeFilter(t) {
       if (t) {
-        return orderEnum.sendType.find((item) => item.key == t).label;
+        const item = orderEnum.sendType.find((item) => item.key == t);
+        return item ? item.label : "-";
       } else {
         return t;
       }