Merge remote-tracking branch 'origin/feature/20240301_1544_sale' into release_pre_20240613152516

src/views/sale/itemList.vue

@@ -2,7 +2,7 @@
   <div class="page_consignList">
     <div class="filter-container">
       <div class="button_left">
-        <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 200px;" placeholder="请输入商品标题"/>
+        <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 200px;" placeholder="请输入商品标题" />
         <el-select v-model="listQuery.isAbleSale" placeholder="请选择是否出售" class="filter-item" style="width: 200px;">
           <el-option
             v-for="item in options"
@@ -60,8 +60,13 @@
       </el-table-column>
       <el-table-column align="center" min-width="100px" prop="stock" label="库存" />
       <el-table-column align="center" min-width="100px" prop="creatorName" label="作者" />
+      <el-table-column align="center" min-width="100px" prop="creatorId" label="用户ID">
+        <template slot-scope="scope">
+          <div class="user_self" @click="handleToSelf(scope.row)">{{ scope.row.creatorId }}</div>
+        </template>
+      </el-table-column>
       <el-table-column align="center" min-width="100px" prop="updateTime" label="更新时间" />
-      <el-table-column align="center" min-width="100px" prop="statusName" label="状态" >
+      <el-table-column align="center" min-width="100px" prop="statusName" label="状态">
         <template slot-scope="scope">
           <span class="tooltip-span">{{ `${scope.row.statusName || '-'}` }}</span>
         </template>
@@ -199,6 +204,12 @@ export default {
         this.listLoading = false
       })
     },
+    /**
+     * 详情
+     */
+    handleToSelf(item) {
+      this.$router.push({ path: '/user/userDetail', query: { id: item.creatorId }})
+    },
     /**
      * 详情
      */
@@ -276,11 +287,15 @@ export default {
 
 .page_consignList {
   padding: 20px;
+
   .filter-container {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
   }
+  .user_self {
+    color: #409EFF;
+  }
 }
 
 </style>

src/views/user/user.vue

@@ -3,6 +3,7 @@
 
     <!-- 查询和其他操作 -->
     <div class="filter-container">
+      <el-input v-model="listQuery.userId" clearable size="small" class="filter-item" style="width: 200px;" placeholder="请输入用户ID"/>
       <el-input v-model="listQuery.username" clearable size="small" class="filter-item" style="width: 200px;" placeholder="请输入用户名"/>
       <el-input v-model="listQuery.mobile" clearable size="small" class="filter-item" style="width: 200px;" placeholder="请输入手机号"/>
       <el-button class="filter-item" type="primary" size="mini" icon="el-icon-search" @click="handleFilter">查找</el-button>
@@ -84,6 +85,7 @@ export default {
         page: 1,
         limit: 20,
         username: undefined,
+        userId: undefined,
         mobile: undefined,
         sort: 'add_time',
         order: 'desc'