style:样式优化

838f3033 · wufan · zhangleyuan · 0487f2d6 · 838f3033 · 838f3033
Commit 838f3033 authored Dec 09, 2020 by wufan Committed by zhangleyuan Dec 22, 2020
5 changed files
--- a/src/components/CheckBeforeSendCode.less
+++ b/src/components/CheckBeforeSendCode.less
@@ -11,7 +11,7 @@
      color: #666;
    }
    .nc_iconfont {
-      color: #FF8534;
+      color: #FFB714;
      font-weight: bold;
      border-color: #e8e8e8;
      height: 40px;
@@ -30,7 +30,7 @@
    border-radius: 4px 0 0 4px;
  }
  .nc_scale .btn_ok {
-    color: #FF8534;
+    color: #FFB714;
    height: 40px;
    line-height: 40px;
    box-sizing: border-box;
@@ -42,7 +42,7 @@
    .nc-lang-cnt {
      color: #666;
      a {
-        color: #FC9C6B;
+        color: #FFB714;
      }
    }
  }

--- a/src/core/antd.less
+++ b/src/core/antd.less
@@ -6,7 +6,7 @@
 */
 @import './variables.less';
-@active-color: #ff8534;
+@active-color: #ffb000;
 // 消息提示框
 .ant-message {
@@ -224,18 +224,11 @@
 .ant-btn {
  height: 28px;
  font-weight: 400 !important;
-  padding: 0 12px !important;
-  // border-radius: 2px !important;
  border: 1px solid #e8e8e8;
-  // &:hover {
-  //   border: 1px solid #fdb089 !important;
-  //   color: #fdb089 !important;
-  // }
  &:focus,
  :active {
-    border: 1px solid #ff8534 !important;
+    border: 1px solid #ffb000 !important;
-    color: #ff8534 !important;
+    color: #ffb000 !important;
  }
 }
@@ -291,7 +284,7 @@
    position: absolute;
    width: 30px;
    height: 2px;
-    background: #ff8534 !important;
+    background: #ffb000 !important;
    left: 50%;
    transform: translateX(-50%);
  }
@@ -367,29 +360,18 @@ mr0 {
  border-color: @xm-color-border  !important;
 }
-// .ant-table-body {
-//   .ant-select-dropdown-menu-item-selected,
-//   .ant-select-dropdown-menu-item-selected:hover {
-//     background-color: @xm-select-item-hover !important;
-//   }
-// }
-// .dropdown-active-background {
-//   .ant-select-dropdown-menu-item-active {
-//     background-color: @xm-select-item-hover !important;
-//   }
-// }
 .ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled) {
  background: #F3F6FA;
  .ant-select-selected-icon {
-    color: #FE8534 !important;
+    color:#ffb000 !important;
  }
 }
 .ant-select-dropdown-menu-item-selected {
  background: none;
  font-weight: 400 !important;
-  color: #FE8534;
+  color:#ffb000;
 }
 .ant-btn-primary.ant-btn {
@@ -489,13 +471,6 @@ mr0 {
      margin-right: 24px;
    }
  }
-  // &:hover {
-  //   &::-webkit-scrollbar-thumb {
-  //     /*滚动条里面小方块*/
-  //     background: rgba(204, 204, 204, 1);
-  //   }
-  // }
 }
 .no-scrollbar {
@@ -521,7 +496,7 @@ mr0 {
 .ant-modal {
  .ant-input {
    &:focus {
-      border: 1px solid #ffbb94 !important;
+      border: 1px solid #ffb000 !important;
    }
  }
 }
@@ -553,12 +528,12 @@ mr0 {
 .ant-btn-danger:hover,
 .ant-btn-danger:focus {
  color: #fff !important;
-  background-color: #ff7875 !important;
+  background-color: #ffb000 !important;
-  border-color: #ff7875 !important;
+  border-color: #ffb000 !important;
 }
 .ant-modal-confirm-info .ant-modal-confirm-body > .anticon {
-  color: #fdb089!important;
+  color: #ffb000!important;
 }
 .ant-breadcrumb > span:last-child .ant-breadcrumb-separator {
@@ -586,7 +561,7 @@ mr0 {
  font-size: 22px !important;
  line-height: 22px !important;
  float: left !important;
-  color: #FC9C6B !important;
+  color:#ffb000 !important;
  margin-right: 16px !important;
  &.blue {
    color: #5CBAFF !important;
@@ -612,7 +587,7 @@ mr0 {
    margin-right: 16px;
  }
  >.confirm-icon{
-    color: #FC9C6B;
+    color: #ffb000;
  }
  .ant-modal-confirm-content {
    margin-left: 38px;

--- a/src/modules/store-manage/CourseCatalogPage.less
+++ b/src/modules/store-manage/CourseCatalogPage.less
@@ -11,16 +11,19 @@
        font-weight: 400;
        color: #5289FA;
        line-height: 20px;
+        cursor: pointer;
    }
    .edit-btn{
        font-weight: 400;
        color: #5289FA;
        line-height: 20px;
+        cursor: pointer;
    }
    .delete-btn{
        font-weight: 400;
        color: #5289FA;
        line-height: 20px;
+        cursor: pointer;
    }
    .empty-child{
        color:#666;

--- a/src/modules/store-manage/EmployeeAddOrEditModal.tsx
+++ b/src/modules/store-manage/EmployeeAddOrEditModal.tsx
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-11-27 16:21:49
 * @LastEditors: wufan
- * @LastEditTime: 2020-12-09 10:56:50
+ * @LastEditTime: 2020-12-09 20:01:00
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -148,6 +148,8 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
      case "phone":
        form.setFieldsValue({ phone: value });
        setPhone(value);
+        setPhoneErrorMessage("");
+        setPhoneStatus("");
        return;
      case "role":
@@ -220,6 +222,7 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
                style={{ width: 200 }}
                placeholder="请输入员工名称"
                maxLength={15}
+                autoComplete="off"
                onChange={(e) => handleChangeValues("nickName", e.target.value)}
              />
            </Form.Item>
@@ -231,12 +234,21 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
              validateStatus={phoneStatus}
              help={phoneErrorMessage}
            >
-              <InputNumber
+              <Input
                style={{ width: 200 }}
                placeholder="请输入手机号"
                maxLength={11}
+                autoComplete="off"
                disabled={!!props.choosedItem.nickName}
-                onChange={(value) => handleChangeValues("phone", value)}
+                onChange={(e) => {
+                  if((e.target.value).match(/^\d+$/)){
+                    handleChangeValues("phone", e.target.value);
+                  }  else {
+                    setPhoneErrorMessage("只能输入数字");
+                    setPhoneStatus("error");
+                  }
+                  }
+                }
              />
            </Form.Item>

--- a/src/modules/store-manage/modal/SecondCatalogAddOrEditModal.tsx
+++ b/src/modules/store-manage/modal/SecondCatalogAddOrEditModal.tsx
 /*
 * @Author: wufan
 * @Date: 2020-11-27 16:21:49
- * @LastEditors: zhangleyuan
+ * @LastEditors: wufan
- * @LastEditTime: 2020-12-08 18:05:52
+ * @LastEditTime: 2020-12-09 20:01:24
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -129,6 +129,7 @@ function SecondCatalogAddOrEditModal(props: SecondCatalogAddOrEditModalProps) {
              maxLength={10}  
              style={{ width: 240 }}  
              defaultValue={secondCatalogName}
+              autoComplete="off"
              onChange={(e) => { 
                setSecondCatalogName(e.target.value);
              }}