feat:修改UI验收后的问题

b838da55 · zhangleyuan · 06f15164 · b838da55 · b838da55 · b838da55
Commit b838da55 authored Dec 14, 2020 by zhangleyuan
11 changed files
--- a/src/common/less/icon-font.less
+++ b/src/common/less/icon-font.less
 @font-face {
  font-family: 'iconfont';  /* project id 2223403 */
-  src: url('//at.alicdn.com/t/font_2223403_13iutf1by4j8.eot');
+  src: url('//at.alicdn.com/t/font_2223403_uo63ciaamd.eot');
-  src: url('//at.alicdn.com/t/font_2223403_13iutf1by4j8.eot?#iefix') format('embedded-opentype'),
+  src: url('//at.alicdn.com/t/font_2223403_uo63ciaamd.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_2223403_13iutf1by4j8.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_2223403_uo63ciaamd.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_2223403_13iutf1by4j8.woff') format('woff'),
+  url('//at.alicdn.com/t/font_2223403_uo63ciaamd.woff') format('woff'),
-  url('//at.alicdn.com/t/font_2223403_13iutf1by4j8.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_2223403_uo63ciaamd.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_2223403_13iutf1by4j8.svg#iconfont') format('svg');
+  url('//at.alicdn.com/t/font_2223403_uo63ciaamd.svg#iconfont') format('svg');
 }
 .iconfont{
  font-family:"iconfont" !important;

--- a/src/components/CheckBeforeSendCode.less
+++ b/src/components/CheckBeforeSendCode.less
@@ -26,7 +26,7 @@
    box-sizing: border-box;
  }
  .nc_scale .nc_ok, .nc_scale .nc_bg {
-    background: #FFE7D6;
+    background: #FFB714;
    border-radius: 4px 0 0 4px;
  }
  .nc_scale .btn_ok {

--- a/src/core/global.less
+++ b/src/core/global.less
@@ -1611,7 +1611,7 @@ input:focus {
  font-size: 22px !important;
  line-height: 22px !important;
  float: left !important;
-  color: #FC9C6B !important;
+  color: #FFB714 !important;
  margin-right: 16px !important;
 }

--- a/src/index.html
+++ b/src/index.html
 <!--
 * @Author: 吴文洁
 * @Date: 2020-08-24 12:20:57
- * @LastEditors: wufan
+ * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-11 09:49:03
+ * @LastEditTime: 2020-12-14 15:13:30
 * @Description: 
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 -->
@@ -25,7 +25,7 @@
      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
    -->
    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_13iutf1by4j8.css">
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_uo63ciaamd.css">
    <!--
      Notice the use of %PUBLIC_URL% in the tags above.

--- a/src/modules/personalInfo/ChangePhoneModal.tsx
+++ b/src/modules/personalInfo/ChangePhoneModal.tsx
@@ -133,16 +133,21 @@ function ChangePhoneModal(props: changePhoneModalProps) {
            <div className="desc">请输入新的手机号</div>
            <div className="new-phone-content"> 
                <Input
-                    type="number"
                    maxLength={11}
                    name="newPhone"
                    placeholder="请输入新手机号"
                    value={newPhone}
                    className={ newPhoneError ? 'error-input' : ''}
                    onChange={(e) => { 
-                        setNewPhone(e.target.value);
+                        if((e.target.value).match(/^\d+$/)){
-                        setNewPhoneError(false);
+                            setNewPhone(e.target.value);
-                        setErrorMessageText('')
+                            setNewPhoneError(false);
+                            setErrorMessageText('')
+                        }  else {
+                            setErrorMessageText('仅支持输入数字'); 
+                            setNewPhoneError(true);  
+                        }
                    }}
                    style={{ width:200,height:32}}
                />

--- a/src/modules/root/Header.tsx
+++ b/src/modules/root/Header.tsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2019-09-10 18:26:03
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-10 19:48:55
+ * @LastEditTime: 2020-12-14 15:30:19
 * @Description:
 */
 import React , { useContext, useState}from 'react';
@@ -69,7 +69,7 @@ function Header(props:headerProps){
    return confirm({
      title: "你确定要退出登录吗？",
      content: "退出后，需重新登录",
-      icon: <QuestionCircleOutlined />,
+      icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
      okText: "退出登录",
      cancelText: "点错了",
      onOk: () => {

--- a/src/modules/root/Login.jsx
+++ b/src/modules/root/Login.jsx
@@ -76,6 +76,16 @@ function Login(props) {
  }
  function handleSubmit() {
+    if (!phone) {
+      setPhoneError(true);
+      setErrorMessage("请输入手机号");
+      return;
+    }
+    if (phone.length != 11) {
+      setPhoneError(true);
+      setErrorMessage("请输入11位手机号")
+      return;
+    }
    if(!phoneverify){
      setErrorMessage("请输入验证码");
      return;
@@ -178,7 +188,7 @@ function Login(props) {
                    </div>
                    <div className="submit">
                      <div className="btn">
-                        <button id='loginIn'  onClick={ () => { handleSubmit() } }>登录</button>
+                        <button id='loginIn'  onClick={ () => { handleSubmit() } } >登录</button>
                      </div>
                    </div>
                  </div>

--- a/src/modules/store-manege/CourseCatalogPage.less
+++ b/src/modules/store-manege/CourseCatalogPage.less
@@ -3,6 +3,17 @@
        thead{
            display:none;
        }
+        tbody tr td{
+            border-bottom:none;
+            background:#FAFAFA;
+        }
+        // tr:hover td{
+        //     background: #FAFAFA !important;
+        // }
+        // tbody tr:hover{
+        //     background: #FAFAFA !important;
+        // }
    }
    .divider-line{
        color: #BFBFBF;
@@ -28,5 +39,10 @@
    .empty-child{
        color:#666;
        font-size:14px;
+        text-align:center;
+        background: #FAFAFA;
    }
+    // tr.ant-table-expanded-row:hover > td {
+    //     background: #FAFAFA !important;
+    // }
 }
\ No newline at end of file
--- a/src/modules/store-manege/CourseCatalogPage.tsx
+++ b/src/modules/store-manege/CourseCatalogPage.tsx
@@ -58,7 +58,7 @@ function CourseCatalogPage() {
    return  confirm({
      title: record.type==='parent'? '你确定要删除此分类吗？':'你确定要删除此子分类吗？',
      content: record.type==='parent'? '删除后，此分类下包含的所有子分类都会被删除，此操作不可恢复。':'此操作不可恢复。',
-      icon: <QuestionCircleOutlined />,
+      icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
      okText: '删除',
      okType: 'danger',
      cancelText: '取消',
@@ -178,7 +178,7 @@ function CourseCatalogPage() {
                pagination={false}
                expandedRowRender={(record:RecordTypes) => {
                  if(!record.sonCategoryList){
-                    return <div>还未添加任何子分类</div>;
+                    return <div className="empty-child">还未添加任何子分类</div>;
                  }
                  if (record.sonCategoryList.length !== 0){
                    return <Table columns={parseColumn()} dataSource={record.sonCategoryList} pagination={false}   className="child-table"/>

--- a/src/modules/store-manege/EmployeesManagePage.tsx
+++ b/src/modules/store-manege/EmployeesManagePage.tsx
@@ -206,7 +206,7 @@ function EmployeesManagePage() {
    return confirm({
      title: "你确定要删除此讲师吗？",
      content: "删除后，讲师将不能登录系统，此操作不能被撤销",
-      icon: <QuestionCircleOutlined />,
+      icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
      okText: "删除",
      cancelText: "取消",
      onOk: () => {

--- a/src/modules/store-manege/StoreDecorationPage.tsx
+++ b/src/modules/store-manege/StoreDecorationPage.tsx
@@ -90,7 +90,7 @@ function StoreDecorationPage() {
  function handleDeleteDecorationConfirm(record: RecordTypes) {
    return confirm({
      title: "你确定要删除这个banner吗？",
-      icon: <QuestionCircleOutlined />,
+      icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
      okText: "删除",
      cancelText: "取消",
      onOk: () => {