From 4d204d69f1fad6364b780a220be78f8d76099f87 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Sun, 21 Jul 2024 13:34:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=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

---
 yshop-drink-vue3/src/locales/zh-CN.ts            | 16 ++++++++++++++++
 .../views/mall/order/storeOrder/OrderDetail.vue  | 12 ++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/yshop-drink-vue3/src/locales/zh-CN.ts b/yshop-drink-vue3/src/locales/zh-CN.ts
index ef9d8d9..115ba0e 100644
--- a/yshop-drink-vue3/src/locales/zh-CN.ts
+++ b/yshop-drink-vue3/src/locales/zh-CN.ts
@@ -289,6 +289,22 @@ export default {
     header: '头部'
   },
   action: {
+    setPrint: '配置打印机',
+    check: '审核',
+    buyDetail: '购买记录',
+    order: '订单',
+    qrcode: '二维码',
+    couponRecord: '优惠券领取记录',
+    yue: '积分余额',
+    userDetail: '用户详情',
+    refundOrder: '订单退款',
+    orderRecord: '订单记录',
+    orderDetail: '订单详情',
+    updateOrder: '修改订单',
+    orderSend: '订单发货',
+    remark: '备注',
+    sendInfo: '配送信息',
+    batchCreate: '批量新增',
     create: '新增',
     add: '新增',
     del: '删除',
diff --git a/yshop-drink-vue3/src/views/mall/order/storeOrder/OrderDetail.vue b/yshop-drink-vue3/src/views/mall/order/storeOrder/OrderDetail.vue
index 36588fc..c006fd2 100644
--- a/yshop-drink-vue3/src/views/mall/order/storeOrder/OrderDetail.vue
+++ b/yshop-drink-vue3/src/views/mall/order/storeOrder/OrderDetail.vue
@@ -25,11 +25,11 @@
                   <td>状态</td>
                 </tr>
                 <tr  v-for="(val, i ) in product" :key="i" >
-                    <td v-if="val.addProductMark == num-1 "><el-image style="width: 40px; height: 40px" :src="val.image" :fit="fit" /></td>
-                    <td v-if="val.addProductMark == num-1">{{ val.title}}</td>
-                    <td v-if="val.addProductMark == num-1">{{ '￥'+ val.price}}</td>
-                    <td v-if="val.addProductMark == num-1">{{ ' x '+ val.number}}</td>
-                    <td v-if="val.addProductMark == num-1">
+                    <td><el-image style="width: 40px; height: 40px" :src="val.image" :fit="fit" /></td>
+                    <td>{{ val.title}}</td>
+                    <td>{{ '￥'+ val.price}}</td>
+                    <td>{{ ' x '+ val.number}}</td>
+                    <td>
                       <el-tag  type="success" v-if="val.isOrder==1">已出单</el-tag>
                       <el-tag  type="danger" v-else>未出单</el-tag>
                     </td>
@@ -109,7 +109,7 @@ const open = async (type: string, id?: number) => {
   nickname.value = DetailData.value.userRespVO.nickname
   product.value = DetailData.value.storeOrderCartInfoDOList
   //获取加餐数量
-  addProductMark.value = DetailData.value.storeOrderCartInfoDOList[DetailData.value.storeOrderCartInfoDOList.length - 1].addProductMark
+  //addProductMark.value = DetailData.value.storeOrderCartInfoDOList[DetailData.value.storeOrderCartInfoDOList.length - 1].addProductMark
 
   console.log('addProductMark.value:',addProductMark.value )
 }