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

src/views/sale/saleAdd.vue

@@ -203,7 +203,7 @@ export default {
         images: [{ required: true, message: '至少一张图片', trigger: 'blur' }],
         name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
         stock: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
-        rebate: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+        rebate: [{ required: true, message: '佣金比例不能为空', trigger: 'blur' }],
         distributionPrice: [{ required: true, message: '供货价不能为空', trigger: 'blur' }],
         buyLimitNum: [{ required: true, message: '限购数量不能为空', trigger: 'blur' }],
         auctionStartTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
@@ -366,15 +366,15 @@ export default {
       } else {
         this.goods.images = ''
       }
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
 
       this.$refs.goods.validate((valid) => {
         if (valid) {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
           if (this.numType === -1) {
             this.goods.buyLimitNum = -1
           }

src/views/sale/saleList.vue

@@ -27,7 +27,7 @@
 
       <el-table-column align="center" label="上架类型" prop="type" >
         <template slot-scope="scope">
-          <span class="tooltip-span">{{ `${scope.row.type === 1 ? '一口价' : '竞拍'}` }}</span>
+          <span class="tooltip-span">{{ `${scope.row.type === 1 ? '一口价' : scope.row.type === 3 ? '帖子' : '竞拍'}` }}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="供货价" prop="distributionPrice">