feat: 添加用户登录功能

src/views/order/index/config/content.ts

@@ -23,8 +23,7 @@ const contentConfig: IContentConfig = {
     }
     return OrderApi.getList(params);
   },
-  indexActionData: {
-  },
+  indexActionData: {},
   // deleteAction: OrderApi.delete,
   // modifyAction: function (data) {
   //   // return OrderApi.edit(data);
@@ -46,28 +45,30 @@ const contentConfig: IContentConfig = {
       label: "订单号信息",
       align: "center",
       prop: "orderNo",
+      templet: "custom",
+      slotName: "orderNo",
     },
     {
       label: "商品信息",
       align: "center",
-      templet: 'custom',
-      prop: 'goods',
-      slotName: 'goods',
+      templet: "custom",
+      prop: "goods",
+      slotName: "goods",
       width: 240,
     },
     {
       label: "台桌信息",
       align: "center",
-      templet: 'custom',
-      slotName: 'table',
+      templet: "custom",
+      slotName: "table",
       width: 150,
     },
     {
       label: "订单原金额 不含折扣价格",
       align: "center",
       prop: "originAmount",
-      templet: 'custom',
-      slotName: 'originAmount',
+      templet: "custom",
+      slotName: "originAmount",
       width: 120,
       hidden: true,
     },
@@ -117,7 +118,7 @@ const contentConfig: IContentConfig = {
       fixed: "right",
       width: 150,
       templet: "custom",
-      slotName: 'operate'
+      slotName: "operate",
     },
   ],
 };

src/views/order/index/index.vue

@@ -5,9 +5,9 @@
     <page-search
       ref="searchRef"
       :search-config="searchConfig"
+      :isOpenAutoSearch="true"
       @query-click="handleQueryClick"
       @reset-click="handleResetClick"
-      :isOpenAutoSearch="true"
     />
     <!-- 列表 -->
     <page-content
@@ -24,6 +24,20 @@
       <template #originAmount="scope">
         {{ returnOriginAmount(scope.row) }}
       </template>
+
+      <template #orderNo="scope">
+        <div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            :content="scope.row.orderNo"
+            placement="top-start"
+          >
+            {{ scope.row.orderNo }}
+          </el-tooltip>
+        </div>
+      </template>
+
       <template #status="scope">
         <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
           {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
@@ -31,16 +45,16 @@
       </template>
       <template #goods="scope">
         <div class="goods_info">
-          <div class="row" v-for="item in scope.row.goods" :key="item.id">
-            <el-image :src="item.productImg" class="cover" lazy></el-image>
+          <div v-for="item in scope.row.goods" :key="item.id" class="row">
+            <el-image :src="item.productImg" class="cover" lazy />
             <div class="info">
               <div class="name">
                 <span :class="[item.isVip == 1 ? 'colorStyle' : '']">
                   {{ item.productName }}
                 </span>
-                <span class="refund" v-if="item.refundNumber">(退 - {{ item.refundNumber }})</span>
+                <span v-if="item.refundNumber" class="refund">(退 - {{ item.refundNumber }})</span>
               </div>
-              <div class="sku">{{ item.productSkuName }}</div>
+              <div class="sku">{{ item.skuName }}</div>
             </div>
           </div>
         </div>
@@ -73,12 +87,12 @@
       </template>
       <template #operate="scope">
         <div>
-          <el-button @click="showdetail(scope.row)" link>详情</el-button>
-          <el-button link v-if="scope.row.status == 'done'">开票</el-button>
+          <el-button link @click="showdetail(scope.row)">详情</el-button>
+          <el-button v-if="scope.row.status == 'done'" link>开票</el-button>
           <el-button
             v-if="scope.row.status == 'unpaid'"
-            @click="toPayOrder(scope.row)"
             type="primary"
+            @click="toPayOrder(scope.row)"
           >
             结账
           </el-button>
@@ -106,7 +120,7 @@
       </template>
     </page-modal>
 
-    <orderDetail ref="refDetail" @close="refresh"></orderDetail>
+    <orderDetail ref="refDetail" @close="refresh" />
   </div>
 </template>
 
@@ -317,7 +331,9 @@ function showdetail(row: OrderInfoVo) {
 .goods_info {
   .row {
     display: flex;
-
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
     &:not(:first-child) {
       margin-top: 10px;
     }
@@ -331,8 +347,7 @@ function showdetail(row: OrderInfoVo) {
       flex: 1;
       display: flex;
       flex-direction: column;
-      padding-left: 10px;
-
+      margin-top: 2px;
       .sku {
         color: #999;
       }