Merge branch 'dev'

src/views/product-manage/competitor-monitor/component/EditDrawer.vue

@@ -98,7 +98,7 @@ function closeDrawer() {
           <el-input v-model="ruleForm.asin" :disabled="true" />
         </el-form-item>
         <el-form-item class="font-medium" label="店 铺" prop="shop">
-          <el-input v-model="ruleForm.shop_name" />
+          <el-input v-model="ruleForm.shop_name" placeholder="请输入店铺" />
         </el-form-item>
         <el-form-item class="font-medium" label="分 组" prop="tag">
           <el-select v-model="ruleForm.tag" allow-create filterable>

src/views/product-manage/product-list/component/EditDrawer.vue

@@ -115,13 +115,13 @@ function mappingShopId(val: any) {
             SKU
             <span class="ml-4" style="color: #909399">
             <i class="bi bi-info-circle"></i>
-            多个SKU用逗号","连接 
+            多个SKU用逗号","连接
             <span class="italic ml-3">
               e.g. sku1,sku2,sku3
             </span>
             </span>
           </template>
-          <el-input v-model="ruleForm.sku" />
+          <el-input v-model="ruleForm.sku" placeholder="请输入SKU" />
         </el-form-item>
         <el-form-item class="font-medium" label="店 铺：" prop="shop_name">
           <el-select v-model="ruleForm.shop_name" @change="mappingShopId">
@@ -129,7 +129,7 @@ function mappingShopId(val: any) {
           </el-select>
         </el-form-item>
         <el-form-item class="font-medium" label="分 组：" prop="tag">
-          <el-select v-model="ruleForm.tag" allow-create filterable>
+          <el-select v-model="ruleForm.tag" allow-create filterable placeholder="请选择分组">
             <el-option v-for="item in groupOptions" :label="item.tag" :value="item.tag" />
           </el-select>
         </el-form-item>
@@ -141,10 +141,10 @@ function mappingShopId(val: any) {
           <!--  <el-input v-model="ruleForm.activity_price" />-->
           <!--</el-form-item>-->
           <el-form-item class="font-medium" label="最低活动售价：" prop="minimum_price">
-            <el-input v-model="ruleForm.minimum_price" />
+            <el-input v-model="ruleForm.minimum_price" placeholder="请输入最低活动售价" />
           </el-form-item>
         </div>
-        
+
         <el-form-item>
           <el-divider />
           <div class="flex flex-1 justify-end">

src/views/product-manage/product-monitor/component/EditDrawer.vue

@@ -120,19 +120,19 @@ function closeDrawer() {
             SKU
             <span class="ml-4" style="color: #909399">
             <i class="bi bi-info-circle"></i>
-            多个sku用逗号","连接 
+            多个sku用逗号","连接
             <span class="italic ml-2">
               e.g. sku1,sku2,sku3
             </span>
             </span>
           </template>
-          <el-input v-model="ruleForm.sku" />
+          <el-input v-model="ruleForm.sku" placeholder="请输入SKU" />
         </el-form-item>
         <el-form-item class="font-medium" label="店 铺" prop="shop">
           <el-input v-model="ruleForm.shop" />
         </el-form-item>
         <el-form-item class="font-medium" label="分 组" prop="tag">
-          <el-select v-model="ruleForm.tag" allow-create filterable>
+          <el-select v-model="ruleForm.tag" allow-create filterable placeholder="请选择分组">
             <el-option v-for="item in groupOptions" :label="item.tag" :value="item.tag" />
           </el-select>
         </el-form-item>