Merge branch 'dev' into test

src/views/order/index/index.vue

@@ -90,7 +90,6 @@
 
 <script setup>
 import api from './api'
-import { NEllipsis } from 'naive-ui'
 
 const loading = ref(false)
 
@@ -141,6 +140,11 @@ const columns = ref([
     align: 'center',
     key: 'seat',
   },
+  {
+    title: '备注',
+    align: 'center',
+    key: 'notes',
+  },
   {
     title: '订单号',
     align: 'center',
@@ -166,10 +170,8 @@ const columns = ref([
       row.OrderGoods.forEach((item) => {
         el.push(
           h(
-            NEllipsis,
-            {
-              style: 'max-width: 100px',
-            },
+            'div',
+            {},
             {
               default: () => `${item.Goods.name}|${item.pay_price}元|X${item.number}`,
             }
@@ -229,11 +231,6 @@ const columns = ref([
     align: 'center',
     key: 'payment_time',
   },
-  {
-    title: '备注',
-    align: 'center',
-    key: 'notes',
-  },
   // {
   //   title: '操作',
   //   align: 'center',