style:处理UI验收问题

65fd1db4 · zhangleyuan · d4330b87 · 65fd1db4 · 65fd1db4 · 65fd1db4
Commit 65fd1db4 authored Jan 19, 2021 by zhangleyuan
10 changed files
--- a/src/core/antd.less
+++ b/src/core/antd.less
@@ -41,6 +41,8 @@
 }
 .ant-btn-primary {
+  text-shadow: none !important;
+  box-shadow: none !important;
  i {
    color: #fff !important;
  }
@@ -225,11 +227,7 @@
  line-height:20px !important;
  font-weight: 400 !important;
  border: 1px solid #e8e8e8;
-  &:focus,
+  box-shadow: none !important;
-  :active {
-    border: 1px solid #ffb000 !important;
-    color: #ffb000 !important;
-  }
 }
 .ant-input-search-button {
@@ -382,13 +380,6 @@ mr0 {
    background-color: #fdb089 !important;
    border-color: #fdb089 !important;
  }
-  &:focus,
-  :active {
-    border: 1px solid @xm-color-text-select-primary  !important;
-    background-color: @xm-color-text-select-primary  !important;
-  }
  span {
    color: #fff !important;
  }

--- a/src/domains/basic-domain/constants.ts
+++ b/src/domains/basic-domain/constants.ts
 /*
 * @Author: 陈剑宇
 * @Date: 2020-05-07 14:43:01
- * @LastEditTime: 2021-01-18 21:05:12
+ * @LastEditTime: 2021-01-19 14:32:47
 * @LastEditors: zhangleyuan
 * @Description: 
 * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
@@ -9,7 +9,7 @@
 import { MapInterface } from '@/domains/basic-domain/interface'
 // 默认是 dev 环境
-const ENV: string = process.env.DEPLOY_ENV || 'prod';
+const ENV: string = process.env.DEPLOY_ENV || 'dev';
 console.log("process.env.DEPLOY_ENV",process)
 const BASIC_HOST_MAP: MapInterface = {
  dev: 'https://dev-heimdall.xiaomai5.com/',

--- a/src/domains/course-domain/constants.ts
+++ b/src/domains/course-domain/constants.ts
@@ -7,7 +7,7 @@
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
 import { MapInterface } from '@/domains/basic-domain/interface'
-const ENV: string = process.env.DEPLOY_ENV || 'prod';
+const ENV: string = process.env.DEPLOY_ENV || 'dev';
 const appIdMap: MapInterface = {
  dev: 'wx3ea60e78ddfa277e',

--- a/src/modules/course-manage/components/LiveCourseFilter.less
+++ b/src/modules/course-manage/components/LiveCourseFilter.less
@@ -36,6 +36,7 @@
    line-height: 20px;
    .fold-icon {
      font-size: 12px;
+      margin-left:4px;
    }
  }
 }

--- a/src/modules/course-manage/components/LiveCourseList.jsx
+++ b/src/modules/course-manage/components/LiveCourseList.jsx
@@ -32,7 +32,7 @@ const courseStateShow = {
  UN_START: {
    code: 1,
    title: "待开课",
-    color: "#FDBE31",
+    color: "#FFB714",
  },
  STARTING: {
    code: 2,
@@ -259,7 +259,7 @@ class LiveCourseList extends React.Component {
        {
          title: <span>
            <span>店铺展示</span>
-            <Tooltip  title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
+            <Tooltip  title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
          </span>,
          width: "7%",
          dataIndex: "courseware",

--- a/src/modules/course-manage/video-course/components/VideoCourseFilter.less
+++ b/src/modules/course-manage/video-course/components/VideoCourseFilter.less
@@ -37,6 +37,7 @@
    line-height: 20px;
    .fold-icon {
      font-size: 12px;
+      margin-left:4px;
    }
  }
 }

--- a/src/modules/course-manage/video-course/components/VideoCourseList.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-08-05 10:12:45
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-18 21:03:40
+ * @LastEditTime: 2021-01-19 15:53:11
 * @Description: 视频课-列表模块
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -23,7 +23,7 @@ import User from '@/common/js/user'
 import './VideoCourseList.less';
-const ENV = process.env.DEPLOY_ENV || 'prod';
+const ENV = process.env.DEPLOY_ENV || 'dev';
 class VideoCourseList extends React.Component {
@@ -123,7 +123,7 @@ class VideoCourseList extends React.Component {
      {
        title: <span>
          <span>店铺展示</span>
-          <Tooltip  title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
+          <Tooltip  title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
        </span>,
        width: '12%',
        dataIndex: "courseware",

--- a/src/modules/root/Login.jsx
+++ b/src/modules/root/Login.jsx
@@ -122,7 +122,7 @@ function Login(props) {
        <div className="login-box">
          <div className="login">
            <div className="r">
-              <Tabs defaultActiveKey="1" >
+              <Tabs defaultActiveKey="1">
                <TabPane tab="企业微信登录" key="1">
                  <WechatLogin></WechatLogin>
                </TabPane>

--- a/src/modules/root/Login.less
+++ b/src/modules/root/Login.less
-@import url('../../core/variables.less');
+@import url("../../core/variables.less");
 .login-page {
  position: static;
  font-family: "微软雅黑";
  padding: 0;
  min-width: 1200px;
-  background: #21242E;
+  background: #21242e;
-  height:100%;
+  height: 100%;
  .login-main {
    min-width: 1200px;
  }
  .left-banner {
    position: fixed;
-    min-width:315px;
+    min-width: 315px;
-    text-align:center;
+    text-align: center;
    top: 50%;
    left: 30%;
    -webkit-transform: translate(-50%, -50%);
    -moz-transform: translate(-50%, -50%);
    -ms-transform: translate(-50%, -50%);
    -o-transform: translate(-50%, -50%);
-    transform:translate(-50%, -50%);
+    transform: translate(-50%, -50%);
-    .name{
+    .name {
      font-size: 30px;
      font-weight: 500;
-      color: #FFFFFF;
+      color: #ffffff;
      line-height: 42px;
-      margin-top:11px;
+      margin-top: 11px;
    }
-    .desc{  
+    .desc {
      font-size: 14px;
      font-weight: 400;
-      color: #FFFFFF;
+      color: #ffffff;
      line-height: 20px;
-      margin-top:10px;
+      margin-top: 10px;
    }
  }
  .login-box {
@@ -41,10 +41,10 @@
    position: fixed;
    top: 50%;
    left: 70%;
-    -webkit-transform:translate(-50%, -50%);
+    -webkit-transform: translate(-50%, -50%);
    -moz-transform: translate(-50%, -50%);
    -ms-transform: translate(-50%, -50%);
-    -o-transform:translate(-50%, -50%);
+    -o-transform: translate(-50%, -50%);
    transform: translate(-50%, -50%);
    .go-to-site {
@@ -55,7 +55,7 @@
      left: 50%;
      margin-left: -50px;
      a {
-        color: #FFF;
+        color: #fff;
        text-decoration: none;
      }
      span.icon {
@@ -78,43 +78,49 @@
      overflow: hidden;
      background-color: #ffffff;
      border-radius: 4px; //box-shadow: 0 0 17px @sun;
-      .ant-tabs-tab-btn{
+      .ant-tabs-tab-btn {
        color: #999999;
        font-size: 16px;
        font-family: PingFangSC-Medium, PingFang SC;
        font-weight: 500;
        line-height: 25px;
-        &.ant-tabs-tab-active{
+        &.ant-tabs-tab-active {
          color: #333333;
        }
      }
-    .ant-tabs-tab-active{
+      .ant-tabs-tab-active {
-      .ant-tabs-tab-btn{
+        .ant-tabs-tab-btn {
          color: #333333;
        }
      }
+      .ant-tabs-nav::before {
-      .ant-tabs-nav::before{
        display: none;
      }
-    .ant-tabs-tab{
+      .ant-tabs-tab {
        width: 105px;
        text-align: center;
      }
-    .ant-tabs > .ant-tabs-nav .ant-tabs-nav-list{
+      .ant-tabs > .ant-tabs-nav .ant-tabs-nav-list {
        margin: 0 auto;
      }
-    .ant-tabs-top > .ant-tabs-nav .ant-tabs-ink-bar{
+      .ant-tabs-top > .ant-tabs-nav .ant-tabs-ink-bar {
        width: 24px !important;
        height: 4px;
-        margin-left: 30px;
+        margin-left: 47px;
      }
      .l {
        width: 280px;
        height: 100%;
        background: @primary;
-        background: -webkit-gradient(linear, left top, left bottom, from(#ffaa1a), to(#ff8634)) !important;
+        background: -webkit-gradient(
+          linear,
+          left top,
+          left bottom,
+          from(#ffaa1a),
+          to(#ff8634)
+        ) !important;
        display: flex;
        display: -webkit-flex;
        -webkit-flex-direction: column;
@@ -135,7 +141,7 @@
          margin-bottom: 20px;
        }
        .desc {
-          opacity: .7;
+          opacity: 0.7;
          margin-bottom: 20px;
        }
        .items {
@@ -143,11 +149,11 @@
            padding: 0;
            li {
              .icon {
-                -webkit-transform: scale(.8);
+                -webkit-transform: scale(0.8);
-                -moz-transform: scale(.8);
+                -moz-transform: scale(0.8);
-                -ms-transform: scale(.8);
+                -ms-transform: scale(0.8);
-                -o-transform: scale(.8);
+                -o-transform: scale(0.8);
-                transform: scale(.8);
+                transform: scale(0.8);
                display: inline-block;
                margin-right: 10px;
              }
@@ -181,7 +187,7 @@
          display: none;
          text-align: center;
          position: absolute;
-          background: #FFF;
+          background: #fff;
          z-index: 1;
          left: 20px;
          top: 28px;
@@ -219,7 +225,7 @@
              height: 150%;
              top: 0;
              margin-left: -100%;
-              background: #FFF;
+              background: #fff;
              transform-origin: right top;
              transform: rotate(-45deg);
            }
@@ -233,11 +239,10 @@
          font-weight: 500;
          color: #333333;
          line-height: 25px;
-          text-align:center;
+          text-align: center;
-          font-weight:bold;
+          font-weight: bold;
-          margin-bottom:43px;
+          margin-bottom: 43px;
          &::after {
          }
          .text1 {
            color: black;
@@ -259,12 +264,12 @@
              font-weight: 500;
              color: #333;
              &::after {
-                content: '';
+                content: "";
                display: block;
                width: 24px;
                height: 4px;
                border-radius: 3px;
-                background: #FF8534;
+                background: #ff8534;
                margin: 10px auto 0;
              }
            }
@@ -274,16 +279,16 @@
          }
        }
        #password-icon {
-          color: #BFBFBF;
+          color: #bfbfbf;
          margin-right: 10px;
          cursor: pointer;
          &:hover {
-            color: #FC9C6B;
+            color: #fc9c6b;
          }
          -webkit-user-select: none;
-          -moz-user-select:none;
+          -moz-user-select: none;
-          -o-user-select:none;
+          -o-user-select: none;
-          -ms-user-select:none;
+          -ms-user-select: none;
        }
        input {
          display: block;
@@ -298,11 +303,11 @@
          background-image: none;
          border-radius: 4px;
          box-sizing: border-box;
-          -webkit-transition: all .3s linear;
+          -webkit-transition: all 0.3s linear;
-          -moz-transition: all .3s linear;
+          -moz-transition: all 0.3s linear;
-          -ms-transition: all .3s linear;
+          -ms-transition: all 0.3s linear;
-          -o-transition: all .3s linear;
+          -o-transition: all 0.3s linear;
-          transition: all .3s linear;
+          transition: all 0.3s linear;
          &:focus,
          &:active,
          &:hover {
@@ -326,7 +331,7 @@
        }
        :-ms-input-placeholder {
          /* Internet Explorer 10-11 */
-          color: #ccc
+          color: #ccc;
        }
        input:-webkit-autofill,
        textarea:-webkit-autofill,
@@ -356,17 +361,17 @@
            position: absolute;
            right: 10px;
            top: -53px; // border: 1px solid @sun;
-            color: #333;
            height: 25px;
            width: 90px;
            border-radius: 3px;
            margin-top: 60px;
            font-size: 14px; // font-weight: 300;
+            color:#5289FA;
            &:hover {
-              color: #FFB714;
+              color: #ffb714;
            }
            &::before {
-              content: '';
+              content: "";
              display: block;
              height: 20px;
              width: 1px;
@@ -375,26 +380,26 @@
            }
          }
        }
-        .error-message{
+        .error-message {
          font-size: 14px;
          font-weight: 400;
          color: @warning;
          line-height: 20px;
-          margin-top:9px;
+          margin-top: 9px;
        }
-        .network-message{
+        .network-message {
-          text-align:center;
+          text-align: center;
-          font-size:14px;
+          font-size: 14px;
-          color:#000;
+          color: #000;
-          margin-top:11px;
+          margin-top: 11px;
-          .icon{
+          .icon {
-            font-size:14px;
+            font-size: 14px;
-            color:@primary;
+            color: @primary;
-            margin-right:8px;
+            margin-right: 8px;
          }
-          .refresh{
+          .refresh {
-            font-size:14px;
+            font-size: 14px;
-            color:#5289FA;
+            color: #5289fa;
            cursor: pointer;
          }
        }
@@ -404,10 +409,11 @@
        .phoneverify-voice {
          // padding-left: 5px;
          margin-top: 10px;
-          &::after {}
+          &::after {
+          }
        }
        .submit {
-          margin-top:11px;
+          margin-top: 11px;
          button {
            // font-weight: 300;
          }
@@ -423,7 +429,7 @@
            margin-left: 7px;
          }
          &:hover {
-            color: #FC9C6B;
+            color: #fc9c6b;
          }
        }
        .btn {
@@ -436,21 +442,20 @@
            font-weight: 400;
            line-height: 40px;
            border-radius: 4px;
-            -webkit-transition: all .3s;
+            -webkit-transition: all 0.3s;
-            -moz-transition: all .3s;
+            -moz-transition: all 0.3s;
-            -ms-transition: all .3s;
+            -ms-transition: all 0.3s;
-            -o-transition: all .3s;
+            -o-transition: all 0.3s;
-            transition: all .3s;
+            transition: all 0.3s;
            cursor: pointer;
            border: none;
            &:hover {
              opacity: 0.7;
-              background: linear-gradient(90deg, #FFB714 0%, #FFAD34 100%);
+              background: linear-gradient(90deg, #ffb714 0%, #ffad34 100%);
            }
          }
        }
      }
    }
  }
 }
--- a/src/modules/root/WechatLogin.less
+++ b/src/modules/root/WechatLogin.less
@@ -7,7 +7,6 @@
        margin-top: 12px;
        font-size: 14px;
        font-family: PingFangSC-Regular, PingFang SC;
-        font-weight: 400;
        color: #999999;
        line-height: 20px;
    }