许静 5 年之前
父節點
當前提交
2c429525fb

+ 1
- 2
config/config.js 查看文件

296
 
296
 
297
   proxy: {
297
   proxy: {
298
     '/api/': {
298
     '/api/': {
299
-      target: 'http://localhost:8080/',
299
+      target: 'http://192.168.0.84:8080/',
300
       changeOrigin: true,
300
       changeOrigin: true,
301
       // pathRewrite: { '^/server': '' },
301
       // pathRewrite: { '^/server': '' },
302
     },
302
     },
303
   },
303
   },
304
-
305
 };
304
 };

+ 2
- 2
src/global.less 查看文件

48
 }
48
 }
49
 
49
 
50
 .ant-pro-global-header{
50
 .ant-pro-global-header{
51
-  background:linear-gradient(180deg,rgba(107,192,216,1) 0%,rgba(54,141,212,1) 100%);
51
+  background:#393C39;
52
 }
52
 }
53
 .ant-pro-sider-menu-sider.light .ant-pro-sider-menu-logo{
53
 .ant-pro-sider-menu-sider.light .ant-pro-sider-menu-logo{
54
-  background:linear-gradient(180deg,rgba(107,192,216,1) 0%,rgba(54,141,212,1) 100%);
54
+  background:#EF273A;
55
   box-shadow: none;
55
   box-shadow: none;
56
   border: none;
56
   border: none;
57
 }
57
 }

+ 1
- 9
src/layouts/UserLayout.less 查看文件

20
 
20
 
21
 .content {
21
 .content {
22
   flex: 1;
22
   flex: 1;
23
-  padding: 32px 0;
24
-
25
 }
23
 }
26
 
24
 
27
 @media (min-width: @screen-md-min) {
25
 @media (min-width: @screen-md-min) {
28
   .container {
26
   .container {
29
-    background-image: url('../assets/bg.jpg');
30
-    background-repeat: no-repeat;
31
-    background-position: center;
32
-    background-size: 100% 100%;
27
+    background-color: #fff;
33
   }
28
   }
34
 
29
 
35
-  .content {
36
-    padding: 32px 0 24px;
37
-  }
38
 }
30
 }
39
 
31
 
40
 .top {
32
 .top {

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

103
     dataIndex: 'handle',
103
     dataIndex: 'handle',
104
     key: 'handle',
104
     key: 'handle',
105
     align: 'center',
105
     align: 'center',
106
-    render: () => <><span style={{ color: '#1990FF', marginRight: '20px' }} onClick={confirm}>下架<Icon type="shopping-cart" className={styles.shoppingCart} /></span><span style={{ color: '#FF925C' }} onClick={toEditGoods}>编辑<Icon type="form" className={styles.edit} /></span></>,
106
+    render: () => <><span style={{ color: '#EF273A', marginRight: '20px' }} onClick={confirm}>下架<Icon type="shopping-cart" className={styles.shoppingCart} /></span><span style={{ color: '#FF925C' }} onClick={toEditGoods}>编辑<Icon type="form" className={styles.edit} /></span></>,
107
   },
107
   },
108
 ];
108
 ];
109
 function confirm() {
109
 function confirm() {

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

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

+ 1
- 1
src/pages/user/login/components/Login/LoginSubmit.jsx 查看文件

9
   const clsString = classNames(styles.submit, className);
9
   const clsString = classNames(styles.submit, className);
10
   return (
10
   return (
11
     <FormItem>
11
     <FormItem>
12
-      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ background: 'linear-gradient(270deg,rgba(43,112,192,1) 0%,rgba(6,185,209,1) 100%)', borderRadius: '7px', border: 'none' }} />
12
+      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ backgroundColor: '#DB3C4B', borderRadius: '4px', border: 'none' }} />
13
     </FormItem>
13
     </FormItem>
14
   );
14
   );
15
 };
15
 };

+ 18
- 10
src/pages/user/login/components/Login/index.jsx 查看文件

14
     className: '',
14
     className: '',
15
     defaultActiveKey: '',
15
     defaultActiveKey: '',
16
     onTabChange: () => { },
16
     onTabChange: () => { },
17
-    onSubmit: () => {},
17
+    onSubmit: () => { },
18
   };
18
   };
19
 
19
 
20
   constructor(props) {
20
   constructor(props) {
113
 
113
 
114
     });
114
     });
115
     return (
115
     return (
116
-      <div  className={styles.loginBox}>
117
-      <div className={styles.leftBox}></div>
118
-      <LoginContext.Provider value={this.getContext()}>
119
-        <div className={styles.login}>
120
-          <Form onSubmit={this.handleSubmit}>
121
-            {children}
122
-          </Form>
116
+      <>
117
+        <div className={styles.topBox}>
118
+          <div className={styles.con}>
119
+            <p className={styles.welcome}>Welcome</p>
120
+            <div className={styles.title}>
121
+              <span style={{fontSize:'18px'}}>ying xiao yun</span>
122
+              <p className={styles.name}>营销云·系统</p>
123
+            </div>
124
+          </div>
123
         </div>
125
         </div>
124
-      </LoginContext.Provider>
125
-      </div>
126
+        <LoginContext.Provider value={this.getContext()}>
127
+          <div className={styles.login}>
128
+            <Form onSubmit={this.handleSubmit}>
129
+              {children}
130
+            </Form>
131
+          </div>
132
+        </LoginContext.Provider>
133
+      </>
126
     );
134
     );
127
   }
135
   }
128
 }
136
 }

+ 37
- 17
src/pages/user/login/components/Login/index.less 查看文件

1
 @import '~antd/es/style/themes/default.less';
1
 @import '~antd/es/style/themes/default.less';
2
-.loginBox{
3
-  width:880px;
4
-height:480px;
5
-background:rgba(255,255,255,1);
6
-box-shadow:0px 2px 14px 4px rgba(0,0,0,0.12);
7
-border-radius:30px;
8
-margin: 16vh auto;
9
-.leftBox{
10
-  width:440px;
11
-height:480px;
12
-background:linear-gradient(180deg,rgba(108,193,216,1) 0%,rgba(54,141,212,1) 100%);
13
-border-radius:30px 0px 0px 30px;
14
-display: inline-block;
15
-}
2
+
3
+.topBox{
4
+height:42vh;
5
+background-color: #DB3C4B;
6
+position: relative;
7
+  .con{
8
+    position: absolute;
9
+    left:50%;
10
+    top:50%;
11
+    margin-top: -100px;
12
+    margin-left: -136px;
13
+    text-align: center;
14
+    height: 200px;
15
+    width: 272px;
16
+    overflow: hidden;
17
+    .welcome{
18
+      color: #fff;
19
+      font-size: 60px;
20
+      font-style: italic;
21
+      margin-bottom: 0;
22
+    }
23
+    .title{
24
+      width: 260px;
25
+      height: 102px;
26
+      border:1px solid #fff;
27
+      text-align: left;
28
+      color:#fff;
29
+      padding: 14px  20px;
30
+      margin:  0 auto;
31
+      .name{
32
+        font-size: 40px;
33
+        margin:0; 
34
+      }
35
+    }
36
+    }
16
 }
37
 }
17
 .login {
38
 .login {
18
   background-color: #fff;
39
   background-color: #fff;
19
-  width:440px;
40
+  width:580px;
20
   height:480px;
41
   height:480px;
21
   padding:120px 50px;
42
   padding:120px 50px;
22
   border-radius:0px 30px 30px 0px;
43
   border-radius:0px 30px 30px 0px;
23
- float: right;
44
+  margin: 0 auto;
24
   :global {
45
   :global {
25
     .ant-tabs .ant-tabs-bar {
46
     .ant-tabs .ant-tabs-bar {
26
       margin-bottom: 24px;
47
       margin-bottom: 24px;
27
       text-align: center;
48
       text-align: center;
28
       border-bottom: 0;
49
       border-bottom: 0;
29
     }
50
     }
30
-
31
     .ant-form-item {
51
     .ant-form-item {
32
       margin: 0 2px 24px;
52
       margin: 0 2px 24px;
33
     }
53
     }