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

src/views/order/saleOrderList.vue

@@ -11,7 +11,7 @@
             size="mini"/>
         </el-select>
         <el-input v-model="listQuery.itemName" clearable class="filter-item" style="width: 200px;" placeholder="请输入藏品名称"/>
-        <el-input v-model="listQuery.sellerName" clearable class="filter-item" style="width: 200px;" placeholder="请输入藏家名称"/>
+        <el-input v-model="listQuery.sellerName" clearable class="filter-item" style="width: 200px;" placeholder="请输入分销商名称"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" style="margin-left: 12px" @click="handleFilter">查找</el-button>
         <el-button class="filter-item" @click="resetSearchForm">重置</el-button>
       </div>
@@ -26,7 +26,7 @@
       highlight-current-row>
       <!--      <el-table-column align="center" label="排行" width="100px" type="index" />-->
       <el-table-column align="center" min-width="100px" prop="distributionOrderId" label="订单编号" />
-      <el-table-column align="center" label="藏家名称" min-width="150px" prop="sellerName">
+      <el-table-column align="center" label="分销商名称" min-width="150px" prop="sellerName">
         <template slot-scope="scope">
           <Line2Hidden :text="scope.row.sellerName || ''" />
         </template>

src/views/sale/itemList.vue

@@ -3,7 +3,7 @@
     <div class="filter-container">
       <div class="button_left">
         <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 200px;" placeholder="请输入商品标题"/>
-        <el-select v-model="listQuery.isOnSale" placeholder="请选择是否出售" class="filter-item" style="width: 200px;">
+        <el-select v-model="listQuery.isAbleSale" placeholder="请选择是否出售" class="filter-item" style="width: 200px;">
           <el-option
             v-for="item in options"
             :key="item.label"
@@ -248,7 +248,6 @@ export default {
             if (item.id === row.id) {
               item.statusName = '违规下架'
               item.status = 1
-              item.isAbleSale = false
               return item
             }
             return item

src/views/sale/saleList.vue

@@ -3,7 +3,7 @@
     <div class="filter-container">
       <div class="button_left">
         <el-input v-model="listQuery.name" clearable class="filter-item" style="width: 200px;" placeholder="请输入标题"/>
-        <el-select v-model="listQuery.isOnSale" placeholder="请选择" class="filter-item" style="width: 200px;">
+        <el-select v-model="listQuery.isAbleSale" placeholder="请选择" class="filter-item" style="width: 200px;">
           <el-option
             v-for="item in options"
             :key="item.label"