许静 пре 5 година
родитељ
комит
034877597e

+ 6
- 1
src/global.less Прегледај датотеку

@@ -55,7 +55,12 @@ ol {
55 55
   box-shadow: none;
56 56
   border: none;
57 57
 }
58
-
58
+.ant-input-affix-wrapper .ant-input-prefix{
59
+  left:7px;
60
+}
61
+.ant-input-affix-wrapper .ant-input:not(:first-child) {
62
+  padding-left: 40px;
63
+}
59 64
 .ant-pro-global-header-trigger{
60 65
   display: none;
61 66
 }

+ 47
- 45
src/pages/integralMall/exchangeRecords.jsx Прегледај датотеку

@@ -246,52 +246,54 @@ function record(props) {
246 246
 
247 247
     <>
248 248
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
249
-        <Form.Item>
250
-          {getFieldDecorator('name')(
251
-            <Input
252
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
253
-              placeholder="用户姓名"
254
-            />,
255
-          )}
256
-        </Form.Item>
257
-        <Form.Item>
258
-          {getFieldDecorator('phone')(
259
-            <Input
260
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
261
-              placeholder="手机号"
262
-            />,
263
-          )}
264
-        </Form.Item>
265
-        <Form.Item>
266
-          {getFieldDecorator('goodName')(
267
-            <Input
268
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
269
-              placeholder="商品名称"
270
-            />,
271
-          )}
272
-        </Form.Item>
273
-        <Form.Item>
274
-          {getFieldDecorator('type')(
275
-            <Select style={{ width: '200px' }} placeholder="用户类型" onChange={handleSelectChange}>
276
-              <Option value="2">置业顾问</Option>
277
-              <Option value="1">销售主管</Option>
278
-              <Option value="0">经纪人</Option>
279
-            </Select>,
280
-          )}
281
-        </Form.Item>
282
-        <Form.Item>
283
-          {getFieldDecorator('state')(
284
-            <Select style={{ width: '200px' }} placeholder="状态" onChange={handleSelectChange}>
285
-              <Option value="1">已领取</Option>
286
-              <Option value="0">未领取</Option>
287
-            </Select>,
288
-          )}
289
-        </Form.Item>
290
-        <Form.Item>
291
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
292
-            搜索
249
+        <div style={{ display: 'flex' }}>
250
+          <Form.Item>
251
+            {getFieldDecorator('name')(
252
+              <Input
253
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
254
+                placeholder="用户姓名"
255
+              />,
256
+            )}
257
+          </Form.Item>
258
+          <Form.Item>
259
+            {getFieldDecorator('phone')(
260
+              <Input
261
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
262
+                placeholder="手机号"
263
+              />,
264
+            )}
265
+          </Form.Item>
266
+          <Form.Item>
267
+            {getFieldDecorator('goodName')(
268
+              <Input
269
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
270
+                placeholder="商品名称"
271
+              />,
272
+            )}
273
+          </Form.Item>
274
+          <Form.Item>
275
+            {getFieldDecorator('type')(
276
+              <Select style={{ width: '220px' }} placeholder="用户类型" onChange={handleSelectChange}>
277
+                <Option value="2">置业顾问</Option>
278
+                <Option value="1">销售主管</Option>
279
+                <Option value="0">经纪人</Option>
280
+              </Select>,
281
+            )}
282
+          </Form.Item>
283
+          <Form.Item>
284
+            {getFieldDecorator('state')(
285
+              <Select style={{ width: '220px' }} placeholder="状态" onChange={handleSelectChange}>
286
+                <Option value="1">已领取</Option>
287
+                <Option value="0">未领取</Option>
288
+              </Select>,
289
+            )}
290
+          </Form.Item>
291
+          <Form.Item>
292
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
293
+              搜索
293 294
           </Button>
294
-        </Form.Item>
295
+          </Form.Item>
296
+        </div>
295 297
         <Form.Item>
296 298
           <DateRange />
297 299
         </Form.Item>

+ 1
- 1
src/pages/style/GoodsList.less Прегледај датотеку

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

+ 1
- 1
src/pages/user/login/components/Login/LoginSubmit.jsx Прегледај датотеку

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

+ 4
- 2
src/pages/user/login/components/Login/index.less Прегледај датотеку

@@ -82,8 +82,10 @@ position: relative;
82 82
   }
83 83
 
84 84
   .prefixIcon {
85
-    color: @disabled-color;
86
-    font-size: @font-size-base;
85
+    color: #fff;
86
+    font-size: 18px;
87
+    background-color: #EF273A;
88
+    padding: 3px 4px;
87 89
   }
88 90
 
89 91
   .submit {