许静 5 年之前
父節點
當前提交
ad6f0d50c9
共有 5 個檔案被更改,包括 34 行新增52 行删除
  1. 4
    0
      config/config.js
  2. 26
    32
      src/pages/Welcome.jsx
  3. 1
    1
      src/pages/customer/report/index.jsx
  4. 2
    2
      src/pages/integralMall/GoodsList.jsx
  5. 1
    17
      src/pages/style/GoodsList.less

+ 4
- 0
config/config.js 查看文件

@@ -286,6 +286,10 @@ export default {
286 286
   // Theme for antd: https://ant.design/docs/react/customize-theme-cn
287 287
   theme: {
288 288
     'primary-color': primaryColor,
289
+    'btn-primary-bg': '#EF273A',
290
+    'table-row-hover-bg': '#eee',
291
+    'btn-danger-bg': '#FF7E48',
292
+
289 293
   },
290 294
   define: {
291 295
     ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION:

+ 26
- 32
src/pages/Welcome.jsx 查看文件

@@ -17,39 +17,33 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
17 17
 // );
18 18
 
19 19
 export default () => (
20
-  <div className="gutter-example">
21
-    <Row gutter={20} type="flex" justify="space-around" align="middle">
22
-      <Col className="gutter-row" span={7} style={{
23
-        background: 'linear-gradient(180deg,rgba(246,168,30,1) 0%,rgba(250,86,139,1) 100%)', height: '150px',
24
-        boxShadow: '0px 1px 5px 1px rgba(0,0,0,0.2)',
25
-        borderRadius: '12px'
20
+  <>
21
+    <div style={{ display: 'flex' }}>
22
+      <div style={{
23
+        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
24
+        boxShadow: '0px 18px 14px -15px rgba(241,43,62,1)',
25
+        borderRadius: '12px', width: '32%', marginRight: '2%'
26 26
       }}>
27
-        <div className="gutter-box" style={{ textAlign: 'center' }}>
28
-          <p className="gutter-tit" style={{ fontSize: '24px', color: '#fff', margin: '26px 0 0 0 ' }}>总用户</p>
29
-          <p className="gutter-num" style={{ fontSize: '51px', color: '#fff', margin: '0' }}>133</p>
30
-        </div>
31
-      </Col>
32
-      <Col className="gutter-row" span={7} style={{
33
-        background: 'linear-gradient(180deg,rgba(78,239,186,1) 0%,rgba(63,197,224,1) 100%)', height: '150px',
34
-        boxShadow: '0px 1px 5px 1px rgba(0,0,0,0.2)',
35
-        borderRadius: '12px'
27
+        <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
28
+        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>133</span>
29
+      </div>
30
+      <div style={{
31
+        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
32
+        boxShadow: '0px 18px 14px -15px rgba(255,126,74,1)',
33
+        borderRadius: '12px', width: '32%', marginRight: '2%'
36 34
       }}>
37
-        <div className="gutter-box" style={{ textAlign: 'center' }}>
38
-          <p className="gutter-tit" style={{ fontSize: '24px', color: '#fff', margin: '24px 0 0 0 ' }}>总注册用户</p>
39
-          <p className="gutter-num" style={{ fontSize: '51px', color: '#fff', margin: '0' }}>76</p>
40
-        </div>
41
-      </Col>
42
-      <Col className="gutter-row" span={7} style={{
43
-        background: 'linear-gradient(180deg,rgba(77,231,247,1) 0%,rgba(89,49,238,1) 100%)', height: '150px',
44
-        boxShadow: '0px 1px 5px 1px rgba(0,0,0,0.2)',
45
-        borderRadius: '12px'
35
+        <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
36
+        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>12</span>
37
+      </div>
38
+      <div style={{
39
+        textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
40
+        boxShadow: '0px 18px 14px -15px rgba(107,130,230,1)',
41
+        borderRadius: '12px', width: '32%',
46 42
       }}>
47
-        <div className="gutter-box" style={{ textAlign: 'center' }}>
48
-          <p className="gutter-tit" style={{ fontSize: '24px', color: '#fff', margin: '26px 0 0 0 ' }}>最近7天新增</p>
49
-          <p className="gutter-num" style={{ fontSize: '51px', color: '#fff', margin: '0' }}>24</p>
50
-        </div>
51
-      </Col>
52
-    </Row>
53
-  </div>
54
-
43
+        <span style={{ fontSize: '24px', color: '#fff' }}>最近7天新增 </span>
44
+        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>91</span>
45
+      </div>
46
+    </div>
47
+    <div>11111111111111</div>
48
+  </>
55 49
 );

+ 1
- 1
src/pages/customer/report/index.jsx 查看文件

@@ -154,7 +154,7 @@ function body(props) {
154 154
           )}
155 155
         </Form.Item>
156 156
         <Form.Item>
157
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
157
+          <Button type="primary" htmlType="submit">
158 158
             搜索
159 159
           </Button>
160 160
         </Form.Item>

+ 2
- 2
src/pages/integralMall/GoodsList.jsx 查看文件

@@ -167,12 +167,12 @@ function header(props) {
167 167
           )}
168 168
         </Form.Item>
169 169
         <Form.Item>
170
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
170
+          <Button type="primary" htmlType="submit" >
171 171
             搜索
172 172
           </Button>
173 173
         </Form.Item>
174 174
       </Form>
175
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods}>新增</Button>
175
+      <Button type="danger" className={styles.addBtn} onClick={toEditGoods}>新增</Button>
176 176
       <Table dataSource={dataSource} columns={columns} />
177 177
       {/* 分页 */
178 178
       /* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

+ 1
- 17
src/pages/style/GoodsList.less 查看文件

@@ -1,25 +1,9 @@
1 1
 .addBtn {
2 2
   padding: 0 40px;
3 3
   height: 36px;
4
-  background-color: #FF7E48;
5
-  color: #fff;
6 4
   margin: 30px 0;
7
-  border-color: #FF7E48;
8
-}
9
-.addBtn:focus {
10
-  color: #fff;
11
-  background-color: #FF7E48;
12
-  border-color: #FF7E48;
13
-}
14
-.searchBtn{
15
- background-color: #EF273A;
16
- border-color: #EF273A;
17
-}
18
-.searchBtn:focus {
19
-  color: #fff;
20
-  background-color: #EF273A;
21
-  border-color: #EF273A;
22 5
 }
6
+
23 7
 .touxiang {
24 8
   width: 93px;
25 9
   height: 93px;