From 167522d4b02709702bff6607c19d350406c5a32a Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 6 Apr 2024 18:03:48 +0800
Subject: [PATCH] 1

---
 src/views/order/component/detail.vue | 130 +++++++++++++++------------
 src/views/order/component/order.vue  |  12 ++-
 2 files changed, 84 insertions(+), 58 deletions(-)

diff --git a/src/views/order/component/detail.vue b/src/views/order/component/detail.vue
index 78f1fa3..4bce60d 100644
--- a/src/views/order/component/detail.vue
+++ b/src/views/order/component/detail.vue
@@ -109,7 +109,10 @@ const getOrderStatus = (id) => {
           共计
           <span style="color: #ff4a00">{{ formData.total_num }}</span> 件商品
         </div>
-        <el-table style="height: calc(100vh - 100px - 14rem);" :data="formData.orderProduct">
+        <el-table
+          style="height: calc(100vh - 100px - 14rem)"
+          :data="formData.orderProduct"
+        >
           <el-table-column prop="cart_info.product.store_name" label="商品信息">
             <template #default="{ row }">
               <div style="display: flex; align-items: center">
@@ -138,54 +141,69 @@ const getOrderStatus = (id) => {
       <div class="table" v-if="formData.orderProduct && activeStore == 1">
         <div class="table-title">订单信息</div>
         <div class="table-info">
-            <div class="info-item">
-                <div class="info-item-title">创建时间:</div>
-                <div class="info-item-info">{{formData.create_time}}</div>
-            </div>
-            <div class="info-item">
-                <div class="info-item-title">商品总数:</div>
-                <div class="info-item-info">{{formData.total_num}}</div>
-            </div>
-            <div class="info-item">
-                <div class="info-item-title">商品总价:</div>
-                <div class="info-item-info">¥{{formData.total_price}}</div>
-            </div>
-            <div class="info-item">
-                <div class="info-item-title">支付时间:</div>
-                <div class="info-item-info">{{formData.pay_time}}</div>
-            </div>
-            <div class="info-item">
-                <div class="info-item-title">优惠抵扣:</div>
-                <div class="info-item-info">¥{{formData.deduction_price}}</div>
-            </div>
-            <div class="info-item">
-                <div class="info-item-title">实际支付:</div>
-                <div class="info-item-info">¥{{formData.pay_price}}</div>
-            </div>
-            <div class="info-item">
-                <div class="info-item-title">支付方式:</div>
-                <div class="info-item-info">
-                    <span v-if="formData.pay_type==11">微信收款</span>
-                    <span v-if="formData.pay_type==12">现金支付</span>
-                </div>
+          <div class="info-item">
+            <div class="info-item-title">创建时间:</div>
+            <div class="info-item-info">{{ formData.create_time }}</div>
+          </div>
+          <div class="info-item">
+            <div class="info-item-title">商品总数:</div>
+            <div class="info-item-info">{{ formData.total_num }}</div>
+          </div>
+          <div class="info-item">
+            <div class="info-item-title">商品总价:</div>
+            <div class="info-item-info">¥{{ formData.total_price }}</div>
+          </div>
+          <div class="info-item">
+            <div class="info-item-title">支付时间:</div>
+            <div class="info-item-info">{{ formData.pay_time }}</div>
+          </div>
+          <div class="info-item">
+            <div class="info-item-title">优惠抵扣:</div>
+            <div class="info-item-info">¥{{ formData.deduction_price }}</div>
+          </div>
+          <div class="info-item">
+            <div class="info-item-title">实际支付:</div>
+            <div class="info-item-info">¥{{ formData.pay_price }}</div>
+          </div>
+          <div class="info-item">
+            <div class="info-item-title">支付方式:</div>
+            <div class="info-item-info">
+              <span v-if="formData.pay_type == 11">微信收款</span>
+              <span v-if="formData.pay_type == 12">现金支付</span>
+              <span v-if="formData.pay_type == 0">余额支付</span>
+              <span v-if="formData.pay_type == 1">微信支付</span>
+              <span v-if="formData.pay_type == 9">商户余额支付</span>
+              <span v-if="formData.pay_type == 10">对公转账</span>
             </div>
+          </div>
         </div>
-        <div class="table-title">收银员信息</div>
-        <div class="table-info" style="flex-direction: column;">
-            <div class="info-item">
-                <div class="info-item-title">头像:</div>
-                <div class="info-item-info">
-                    <el-image style="height: 4rem;width: 4rem;border-radius: 50%;" :src="formData.service_info.avatar"></el-image>
-                </div>
+        <div class="table-title" v-if="formData.service_info">收银员信息</div>
+        <div
+          class="table-info"
+          v-if="formData.service_info"
+          style="flex-direction: column"
+        >
+          <div class="info-item">
+            <div class="info-item-title">头像:</div>
+            <div class="info-item-info">
+              <el-image
+                style="height: 4rem; width: 4rem; border-radius: 50%"
+                :src="formData.service_info.avatar"
+              ></el-image>
             </div>
-            <div class="info-item">
-                <div class="info-item-title">昵称:</div>
-                <div class="info-item-info">{{formData.service_info.nickname}}</div>
+          </div>
+          <div class="info-item">
+            <div class="info-item-title">昵称:</div>
+            <div class="info-item-info">
+              {{ formData.service_info.nickname }}
             </div>
-            <div class="info-item">
-                <div class="info-item-title">账号:</div>
-                <div class="info-item-info">{{formData.service_info.account}}</div>
+          </div>
+          <div class="info-item">
+            <div class="info-item-title">账号:</div>
+            <div class="info-item-info">
+              {{ formData.service_info.account }}
             </div>
+          </div>
         </div>
       </div>
       <div class="footer" v-if="formData.service_info">
@@ -284,11 +302,11 @@ const getOrderStatus = (id) => {
       padding: 1rem;
       padding-bottom: 6rem;
 
-      .table-title{
+      .table-title {
         font-weight: bold;
         padding-top: 1rem;
       }
-      .table-info{
+      .table-info {
         display: flex;
         flex-wrap: wrap;
         color: #777;
@@ -296,18 +314,18 @@ const getOrderStatus = (id) => {
         padding-bottom: 2rem;
         border-bottom: 1px solid #eee;
 
-        &:last-child{
-            border-bottom: none;
+        &:last-child {
+          border-bottom: none;
         }
 
-        .info-item{
-            width: 33%;
-            display: flex;
-            padding-top: 1rem;
-            .info-item-title{
-                flex-shrink: 0;
-                padding-right: 1rem;
-            }
+        .info-item {
+          width: 33%;
+          display: flex;
+          padding-top: 1rem;
+          .info-item-title {
+            flex-shrink: 0;
+            padding-right: 1rem;
+          }
         }
       }
     }
diff --git a/src/views/order/component/order.vue b/src/views/order/component/order.vue
index cdd04ab..4b6f189 100644
--- a/src/views/order/component/order.vue
+++ b/src/views/order/component/order.vue
@@ -126,8 +126,16 @@ const setForm = (item, index) => {
         </div>
         <div class="bottom">
           <div class="pay">
-            <span v-if="item.paid">已支付</span>
-            <span v-else style="color: #ff4a00;">未支付</span>
+            <div v-if="item.paid">
+              已支付
+              <span v-if="item.pay_type == 12">(现金支付)</span>
+              <span v-if="item.pay_type == 11">(微信支付)</span>
+              <span v-if="item.pay_type == 0">(余额支付)</span>
+              <span v-if="item.pay_type == 1">(微信支付)</span>
+              <span v-if="item.pay_type == 9">(商户余额支付)</span>
+              <span v-if="item.pay_type == 10">(对公转账)</span>
+            </div>
+            <div v-else style="color: #ff4a00;">未支付</div>
           </div>
           <div class="cashier" v-if="item.service_info">收银员: {{ item.service_info.nickname }}</div>
           <div class="cashier" v-else>平台订单</div>