feat: merge-master

src/pages/GoodsManage/SearchForm/index.jsx

@@ -73,15 +73,21 @@ class goodsManage extends Component {
     return (
       <Form name="horizontal_login" layout="inline" className={styles.searchForm}>
         <FormItem label="SKU编码">
-          {getFieldDecorator('skuId', {})(<Input allowClear style={selectW} />)}
+          {getFieldDecorator('skuId', {})(
+            <Input placeholder="请输入SKU编码" allowClear style={selectW} />,
+          )}
         </FormItem>
         <FormItem label="商品名称">
-          {getFieldDecorator('skuName', {})(<Input allowClear style={selectW} />)}
+          {getFieldDecorator('skuName', {})(
+            <Input placeholder="请输入商品名称" allowClear style={selectW} />,
+          )}
         </FormItem>
         <FormItem label="类目">
           {getFieldDecorator('productCategoryId', {})(
             <Cascader
+              placeholder="请选择类目"
               style={selectW}
+              showSearch
               changeOnSelect
               fieldNames={{ label: 'name', value: 'id', children: 'children' }}
               options={treeData}
@@ -90,7 +96,12 @@ class goodsManage extends Component {
         </FormItem>
         <FormItem label="审核状态">
           {getFieldDecorator('state', {})(
-            <Select style={selectW} allowClear showSearch filterOption={filterOption}>
+            <Select
+              style={selectW}
+              placeholder="请选择审核状态"
+              allowClear
+              filterOption={filterOption}
+            >
               {stateList?.map(item => (
                 <Option key={item.value} value={item.value}>
                   {item.label}
@@ -101,17 +112,25 @@ class goodsManage extends Component {
         </FormItem>
         <FormItem label="供货价区间">
           <FormItem className={styles.iptNumRight}>
-            {getFieldDecorator('supplyPriceMin', {})(<InputNumber style={iptNumWidth} />)}
+            {getFieldDecorator('supplyPriceMin', {})(
+              <InputNumber placeholder="请输入" style={iptNumWidth} />,
+            )}
           </FormItem>
           <span>--</span>
           <FormItem className={styles.iptNumRight}>
             {getFieldDecorator('supplyPriceMax', {})(
-              <InputNumber style={iptNumWidth} min={getFieldValue('supplyPriceMin')} />,
+              <InputNumber
+                style={iptNumWidth}
+                placeholder="请输入"
+                min={getFieldValue('supplyPriceMin')}
+              />,
             )}
           </FormItem>
         </FormItem>
         <FormItem label="第三方SKU编码">
-          {getFieldDecorator('thirdSkuNo', {})(<Input allowClear style={selectW} />)}
+          {getFieldDecorator('thirdSkuNo', {})(
+            <Input placeholder="请输入第三方SKU编码" allowClear style={selectW} />,
+          )}
         </FormItem>
         <FormItem className={styles.queryBtn}>
           <Button onClick={() => this.handleSearch()} type="primary" className={styles.button}>
@@ -121,7 +140,7 @@ class goodsManage extends Component {
             重置
           </Button>
         </FormItem>
-        <FormItem style={{ width: '100%', textAlign: 'right' }}>
+        <FormItem style={{ float: 'right' }}>
           <Button type="primary" className={styles.button} onClick={this.addSpu}>
             新增商品
           </Button>

src/pages/GoodsManage/createModal/index.jsx

@@ -534,7 +534,7 @@ class goodsManage extends Component {
                         style={{ width: 690 }}
                         changeOnSelect
                         showSearch
-                        placeholder="请输入商品名称"
+                        placeholder="请选择类目，支持模糊搜索"
                         fieldNames={{ label: 'name', value: 'id', children: 'children' }}
                         options={treeDataArray}
                         onChange={(val, label, ext) => this.treeChange(val, label, ext)}
@@ -566,7 +566,7 @@ class goodsManage extends Component {
                         showSearch
                         style={{ width: 280 }}
                         filterOption={filterOption}
-                        placeholder="请选择，支持模糊搜索"
+                        placeholder="请选择商品品牌，支持模糊搜索"
                       >
                         {brandListArray?.length &&
                           brandListArray.map(item => (