Merge remote-tracking branch 'origin/dev' into dev

peng

2025-07-23 a0f011528fcd9b8f01520d3be4d3e48e245069d3

 seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -28,6 +28,7 @@
<!--              <Input v-model="baseInfoForm.commission" max="100" min="0" clearable placeholder="抽成比例" style="width: 260px" type="number"/>-->
              <InputNumber v-model="baseInfoForm.commission" :formatter="value => `${value}%`"
                           :parser="value => value.replace('%', '')" :max="100" :min="0" clearable
                           :active-change="false"
                           placeholder="抽成比例" style="width: 260px" type="number"/>
            </FormItem>

@@ -400,7 +401,7 @@
            </div>
            <FormItem class="form-item-view-el" label="PC商品描述" prop="intro" style="width: 100%">
              <editor
                :show-upload="false"
                :show-upload="true"
                ref="editor"
                v-model="baseInfoForm.intro"
                height="800px"
@@ -414,7 +415,7 @@

            <FormItem class="form-item-view-el" label="移动端描述" prop="skuList" style="width: 100%">
              <editor
                :show-upload="false"
                :show-upload="true"
                ref="introEditor"
                v-model="baseInfoForm.mobileIntro"
                height="800px"
@@ -699,6 +700,7 @@
        preSaleTime:[],
        preSaleBeginDate:'',
        preSaleEndDate:'',
        commission:5
      },
      /** 表格头 */
      skuTableColumn: [],