login

config/config.js

@@ -296,10 +296,9 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://localhost:8080/',
+      target: 'http://192.168.0.84:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },
   },
-
 };

src/global.less

@@ -48,10 +48,10 @@ ol {
 }
 
 .ant-pro-global-header{
-  background:linear-gradient(180deg,rgba(107,192,216,1) 0%,rgba(54,141,212,1) 100%);
+  background:#393C39;
 }
 .ant-pro-sider-menu-sider.light .ant-pro-sider-menu-logo{
-  background:linear-gradient(180deg,rgba(107,192,216,1) 0%,rgba(54,141,212,1) 100%);
+  background:#EF273A;
   box-shadow: none;
   border: none;
 }

src/layouts/UserLayout.less

@@ -20,21 +20,13 @@
 
 .content {
   flex: 1;
-  padding: 32px 0;
-
 }
 
 @media (min-width: @screen-md-min) {
   .container {
-    background-image: url('../assets/bg.jpg');
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 100% 100%;
+    background-color: #fff;
   }
 
-  .content {
-    padding: 32px 0 24px;
-  }
 }
 
 .top {

src/pages/integralMall/GoodsList.jsx

@@ -103,7 +103,7 @@ const columns = [
     dataIndex: 'handle',
     key: 'handle',
     align: 'center',
-    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></>,
+    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></>,
   },
 ];
 function confirm() {

src/pages/style/GoodsList.less

@@ -1,24 +1,24 @@
 .addBtn {
   padding: 0 30px;
   height: 36px;
-  background-color: #50be00;
+  background-color: #FF7E48;
   color: #fff;
   margin: 30px 0;
-  border-color: #50be00;
+  border-color: #FF7E48;
 }
 .addBtn:focus {
   color: #fff;
-  background-color: #50be00;
-  border-color: #50be00;
+  background-color: #FF7E48;
+  border-color: #FF7E48;
 }
 .searchBtn{
- background-color: #3A91D5;
- border-color: #3A91D5;
+ background-color: #EF273A;
+ border-color: #EF273A;
 }
 .searchBtn:focus {
   color: #fff;
-  background-color: #3A91D5;
-  border-color: #3A91D5;
+  background-color: #EF273A;
+  border-color: #EF273A;
 }
 .touxiang {
   width: 93px;

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={{ background: 'linear-gradient(270deg,rgba(43,112,192,1) 0%,rgba(6,185,209,1) 100%)', borderRadius: '7px', border: 'none' }} />
+      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ backgroundColor: '#DB3C4B', borderRadius: '4px', border: 'none' }} />
     </FormItem>
   );
 };

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

@@ -14,7 +14,7 @@ class Login extends Component {
     className: '',
     defaultActiveKey: '',
     onTabChange: () => { },
-    onSubmit: () => {},
+    onSubmit: () => { },
   };
 
   constructor(props) {
@@ -113,16 +113,24 @@ class Login extends Component {
 
     });
     return (
-      <div  className={styles.loginBox}>
-      <div className={styles.leftBox}></div>
-      <LoginContext.Provider value={this.getContext()}>
-        <div className={styles.login}>
-          <Form onSubmit={this.handleSubmit}>
-            {children}
-          </Form>
+      <>
+        <div className={styles.topBox}>
+          <div className={styles.con}>
+            <p className={styles.welcome}>Welcome</p>
+            <div className={styles.title}>
+              <span style={{fontSize:'18px'}}>ying xiao yun</span>
+              <p className={styles.name}>营销云·系统</p>
+            </div>
+          </div>
         </div>
-      </LoginContext.Provider>
-      </div>
+        <LoginContext.Provider value={this.getContext()}>
+          <div className={styles.login}>
+            <Form onSubmit={this.handleSubmit}>
+              {children}
+            </Form>
+          </div>
+        </LoginContext.Provider>
+      </>
     );
   }
 }

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

@@ -1,33 +1,53 @@
 @import '~antd/es/style/themes/default.less';
-.loginBox{
-  width:880px;
-height:480px;
-background:rgba(255,255,255,1);
-box-shadow:0px 2px 14px 4px rgba(0,0,0,0.12);
-border-radius:30px;
-margin: 16vh auto;
-.leftBox{
-  width:440px;
-height:480px;
-background:linear-gradient(180deg,rgba(108,193,216,1) 0%,rgba(54,141,212,1) 100%);
-border-radius:30px 0px 0px 30px;
-display: inline-block;
-}
+
+.topBox{
+height:42vh;
+background-color: #DB3C4B;
+position: relative;
+  .con{
+    position: absolute;
+    left:50%;
+    top:50%;
+    margin-top: -100px;
+    margin-left: -136px;
+    text-align: center;
+    height: 200px;
+    width: 272px;
+    overflow: hidden;
+    .welcome{
+      color: #fff;
+      font-size: 60px;
+      font-style: italic;
+      margin-bottom: 0;
+    }
+    .title{
+      width: 260px;
+      height: 102px;
+      border:1px solid #fff;
+      text-align: left;
+      color:#fff;
+      padding: 14px  20px;
+      margin:  0 auto;
+      .name{
+        font-size: 40px;
+        margin:0; 
+      }
+    }
+    }
 }
 .login {
   background-color: #fff;
-  width:440px;
+  width:580px;
   height:480px;
   padding:120px 50px;
   border-radius:0px 30px 30px 0px;
- float: right;
+  margin: 0 auto;
   :global {
     .ant-tabs .ant-tabs-bar {
       margin-bottom: 24px;
       text-align: center;
       border-bottom: 0;
     }
-
     .ant-form-item {
       margin: 0 2px 24px;
     }