style

src/global.less

@@ -55,7 +55,12 @@ ol {
   box-shadow: none;
   border: none;
 }
-
+.ant-input-affix-wrapper .ant-input-prefix{
+  left:7px;
+}
+.ant-input-affix-wrapper .ant-input:not(:first-child) {
+  padding-left: 40px;
+}
 .ant-pro-global-header-trigger{
   display: none;
 }

src/pages/integralMall/exchangeRecords.jsx

@@ -246,52 +246,54 @@ function record(props) {
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('name')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="用户姓名"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('phone')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="手机号"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('goodName')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="商品名称"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('type')(
-            <Select style={{ width: '200px' }} placeholder="用户类型" onChange={handleSelectChange}>
-              <Option value="2">置业顾问</Option>
-              <Option value="1">销售主管</Option>
-              <Option value="0">经纪人</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('state')(
-            <Select style={{ width: '200px' }} placeholder="状态" onChange={handleSelectChange}>
-              <Option value="1">已领取</Option>
-              <Option value="0">未领取</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
+        <div style={{ display: 'flex' }}>
+          <Form.Item>
+            {getFieldDecorator('name')(
+              <Input
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="用户姓名"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('phone')(
+              <Input
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="手机号"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('goodName')(
+              <Input
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="商品名称"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('type')(
+              <Select style={{ width: '220px' }} placeholder="用户类型" onChange={handleSelectChange}>
+                <Option value="2">置业顾问</Option>
+                <Option value="1">销售主管</Option>
+                <Option value="0">经纪人</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('state')(
+              <Select style={{ width: '220px' }} placeholder="状态" onChange={handleSelectChange}>
+                <Option value="1">已领取</Option>
+                <Option value="0">未领取</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
           </Button>
-        </Form.Item>
+          </Form.Item>
+        </div>
         <Form.Item>
           <DateRange />
         </Form.Item>

src/pages/style/GoodsList.less

@@ -1,5 +1,5 @@
 .addBtn {
-  padding: 0 30px;
+  padding: 0 40px;
   height: 36px;
   background-color: #FF7E48;
   color: #fff;

src/pages/user/login/components/Login/LoginSubmit.jsx

@@ -9,7 +9,7 @@ const LoginSubmit = ({ className, ...rest }) => {
   const clsString = classNames(styles.submit, className);
   return (
     <FormItem>
-      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ backgroundColor: '#DB3C4B', borderRadius: '4px', border: 'none' }} />
+      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ backgroundColor: '#EF273A', borderRadius: '4px', border: 'none' }} />
     </FormItem>
   );
 };

src/pages/user/login/components/Login/index.less

@@ -82,8 +82,10 @@ position: relative;
   }
 
   .prefixIcon {
-    color: @disabled-color;
-    font-size: @font-size-base;
+    color: #fff;
+    font-size: 18px;
+    background-color: #EF273A;
+    padding: 3px 4px;
   }
 
   .submit {