From ab42e8d9f932021e1100363cd1f42138b3ae8798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Tue, 8 Oct 2024 14:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=8E?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E7=9A=84=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order_manage/components/orderDetail.vue   | 166 ++++++++++++------
 src/views/product/add_shop.vue                |   3 +-
 2 files changed, 117 insertions(+), 52 deletions(-)

diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue
index 94cc1c2..19c573c 100644
--- a/src/views/order_manage/components/orderDetail.vue
+++ b/src/views/order_manage/components/orderDetail.vue
@@ -1,7 +1,18 @@
 <template>
   <el-drawer title="订单详情" size="50%" :visible.sync="drawer" direction="rtl" v-loading="loading">
     <div class="header">
-      <div class="title">【收银订单】</div>
+      <div class="title" style="text-align: center;">【收银订单】</div>
+      <div class="container">
+        <div class="info_content">
+          <div class="item">
+            <div class="label">会员信息</div>
+            <div class="row">
+              <div>会员昵称：-</div>
+              <div>联系电话：-</div>
+            </div>
+          </div>
+        </div>
+      </div>
       <div class="table">
         <div class="item">
           <div class="t">订单状态</div>
@@ -16,61 +27,113 @@
           <div class="b">￥{{ detail.orderAmount }}</div>
         </div>
         <div class="item">
-          <div class="t">订单时间</div>
+          <div class="t">订单类型</div>
           <div class="b">
-            {{ detail.createdAt | timeFilter }}
+            {{ detail.sendType | sendTypeFilter }}
+          </div>
+        </div>
+      </div>
+      <div class="table">
+        <div class="item">
+          <div class="t">订单编号</div>
+          <div class="b">
+            {{ detail.orderNo }}
+          </div>
+        </div>
+        <div class="item">
+          <div class="t">下单时间</div>
+          <div class="b">{{ detail.createdAt | timeFilter }}</div>
+        </div>
+        <div class="item">
+          <div class="t">支付时间</div>
+          <div class="b">
+            {{ detail.createdAt | paidTime | timeFilter }}
           </div>
         </div>
       </div>
     </div>
     <div class="container">
-      <el-tabs v-model="type" @tab-click="getTableData">
-        <el-tab-pane label="基本信息" name="1">
-          <div class="info_content">
-            <div class="item">
-              <div class="label">会员信息</div>
-              <div class="row">
-                <div>会员昵称：-</div>
-                <div>联系电话：-</div>
-              </div>
-            </div>
-            <div class="item">
-              <div class="label">收款详情</div>
-              <div class="row">
-                <!-- <div>商品金额：￥{{ detail.productAmount }}</div> -->
-                <div>打包费：{{ detail.packFee || "-" }}</div>
-              </div>
-              <div class="row">
-                <div>订单原价：￥{{ detail.originAmount }}</div>
-                <div>优惠金额：￥{{ detail.userCouponAmount || "-" }}</div>
-                <div>
-                  实收金额：<span style="color: red;">￥{{ detail.payAmount }}</span>
-                </div>
-              </div>
-              <div class="row">
-                <div>
-                  退款金额：￥{{ detail.refundAmount }}
-                  <span style="color: #FF9731;cursor: pointer;" v-if="detail.isRefund" @click="type = '3'">退款详情></span>
-                </div>
-                <div>支付方式：{{ detail.payType }}</div>
-              </div>
-            </div>
-            <div class="item">
-              <div class="label">订单信息</div>
-              <div class="row">
-                <div>订单编号：{{ detail.orderNo }}</div>
-                <div>订单类型：{{ detail.sendType | sendTypeFilter }}</div>
-                <div>创建时间：{{ detail.createdAt | timeFilter }}</div>
-              </div>
-              <div class="row">
-                <div>设备名称：-</div>
-                <div>支付时间：{{ detail.paidTime | timeFilter }}</div>
-                <div>更新时间：{{ detail.updatedAt | timeFilter }}</div>
-              </div>
+      <!-- <el-tabs v-model="type" @tab-click="getTableData"> -->
+      <!-- <el-tab-pane label="基本信息" name="1"> -->
+      <div class="info_content">
+        <!-- <div class="item">
+          <div class="label">会员信息</div>
+          <div class="row">
+            <div>会员昵称：-</div>
+            <div>联系电话：-</div>
+          </div>
+        </div> -->
+        <div class="item">
+          <div class="label">收款详情</div>
+          <!-- <div class="row">
+            <div>商品金额：￥{{ detail.productAmount }}</div>
+            <div>打包费：{{ detail.packFee || "-" }}</div>
+          </div> -->
+          <div class="row">
+            <div>打包费：{{ detail.packFee || "-" }}</div>
+            <div>订单原价：￥{{ detail.originAmount }}</div>
+            <div>优惠金额：￥{{ detail.userCouponAmount || "-" }}</div>
+            <div>
+              实收金额：<span style="color: red;">￥{{ detail.payAmount }}</span>
             </div>
           </div>
-        </el-tab-pane>
-        <el-tab-pane label="商品信息" name="2">
+          <div class="row">
+            <div>
+              退款金额：￥{{ detail.refundAmount }}
+              <span style="color: #FF9731;cursor: pointer;" v-if="detail.isRefund" @click="type = '3'">退款详情></span>
+            </div>
+            <div>支付方式：{{ detail.payType }}</div>
+          </div>
+        </div>
+        <!-- <div class="item">
+          <div class="label">订单信息</div>
+          <div class="row">
+            <div>订单编号：{{ detail.orderNo }}</div>
+            <div>订单类型：{{ detail.sendType | sendTypeFilter }}</div>
+            <div>创建时间：{{ detail.createdAt | timeFilter }}</div>
+          </div>
+          <div class="row">
+            <div>设备名称：-</div>
+            <div>支付时间：{{ detail.paidTime | timeFilter }}</div>
+            <div>更新时间：{{ detail.updatedAt | timeFilter }}</div>
+          </div>
+        </div> -->
+      </div>
+      <div>
+        <div style="margin-bottom: 16px;font-size:16px;">商品信息</div>
+        <el-table :data="detail.detailList">
+          <el-table-column label="商品">
+            <template v-slot="scope">
+              <div class="shop_info">
+                <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>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="数量">
+            <template v-slot="scope">
+              x{{ scope.row.num }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单价">
+            <template v-slot="scope">
+              ￥{{ scope.row.price }}/
+            </template>
+          </el-table-column>
+          <el-table-column label="小计">
+            <template v-slot="scope">
+              ￥{{ scope.row.priceAmount }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- </el-tab-pane> -->
+      <!-- <el-tab-pane label="商品信息" name="2">
           <el-table :data="detail.detailList">
             <el-table-column label="商品">
               <template v-slot="scope">
@@ -101,7 +164,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </el-tab-pane>
+        </el-tab-pane> 
         <el-tab-pane label="退款详情" name="3" v-if="detail.isRefund">
           <div class="refund_wrap">
             <div class="row" v-for="item in refoundList" :key="item.id">
@@ -127,7 +190,8 @@
             </div>
           </div>
         </el-tab-pane>
-      </el-tabs>
+        -->
+      <!-- </el-tabs> -->
     </div>
   </el-drawer>
 </template>
@@ -294,7 +358,7 @@ export default {
         padding-top: 20px;
 
         div {
-          width: 33.333%;
+          width: 25%;
         }
       }
     }
diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index 72d9d6e..8c460c2 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -750,7 +750,8 @@ export default {
       console.log(this.form.skuList)
       const hasUndefined = this.form.skuList.some(obj => {
         for (const key in obj) {
-          if (obj[key] === undefined) {
+          console.log(key, obj)
+          if (obj['salePrice'] === undefined || obj['memberPrice'] === undefined || obj['costPrice'] === undefined || obj['originPrice'] === undefined) {
             return true; // 如果找到undefined，立即停止搜索并返回true
           }
         }