Merge branch 'dev' into test

src/views/order/index/index.vue

@@ -82,6 +82,7 @@
       :data="data"
       :pagination="pagination"
       :bordered="false"
+      :scroll-x="1800"
       remote
     />
   </CommonPage>
@@ -89,6 +90,7 @@
 
 <script setup>
 import api from './api'
+import { NEllipsis } from 'naive-ui'
 
 const loading = ref(false)
 
@@ -101,15 +103,15 @@ const queryData = ref({
 
 const songs = ref([
   {
-    value: 0,
+    value: 1,
     label: '未付款',
   },
   {
-    value: 1,
+    value: 2,
     label: '已付款',
   },
   {
-    value: 2,
+    value: 3,
     label: '挂帐中',
   },
 ])
@@ -159,8 +161,10 @@ const columns = ref([
       row.OrderGoods.forEach((item) => {
         el.push(
           h(
-            'div',
+            NEllipsis,
-            {},
+            {
+              style: 'max-width: 100px',
+            },
             {
               default: () => `${item.Goods.name}|${item.pay_price}元|X${item.number}`,
             }