Skip to content

X
xiaomai-cloud-class-web
Commit ca69db69 by zhangleyuan
Options

feat:修改UI验收后的问题

parent cce6f9a2
Showing with 264 additions and 11 deletions
src/components/CheckBeforeSendCode.less
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
box-sizing: border-box; box-sizing: border-box;
} }
.nc_scale .nc_ok, .nc_scale .nc_bg { .nc_scale .nc_ok, .nc_scale .nc_bg {
background: #FFE7D6; background: #FFB714;
border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px;
} }
.nc_scale .btn_ok { .nc_scale .btn_ok {
......
src/index.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-24 12:20:57 * @Date: 2020-08-24 12:20:57
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-22 15:24:52 * @LastEditTime: 2020-12-22 15:28:34
* @Description: * @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
--> -->
......
src/modules/personalInfo/ChangePhoneModal.tsx
...@@ -133,16 +133,21 @@ function ChangePhoneModal(props: changePhoneModalProps) { ...@@ -133,16 +133,21 @@ function ChangePhoneModal(props: changePhoneModalProps) {
<div className="desc">请输入新的手机号</div> <div className="desc">请输入新的手机号</div>
<div className="new-phone-content"> <div className="new-phone-content">
<Input <Input
type="number"
maxLength={11} maxLength={11}
name="newPhone" name="newPhone"
placeholder="请输入新手机号" placeholder="请输入新手机号"
value={newPhone} value={newPhone}
className={ newPhoneError ? 'error-input' : ''} className={ newPhoneError ? 'error-input' : ''}
onChange={(e) => { 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}} style={{ width:200,height:32}}
/> />
......
src/modules/root/Header.tsx
...@@ -69,7 +69,7 @@ function Header(props:headerProps){ ...@@ -69,7 +69,7 @@ function Header(props:headerProps){
return confirm({ return confirm({
title: "你确定要退出登录吗？", title: "你确定要退出登录吗？",
content: "退出后，需重新登录", content: "退出后，需重新登录",
icon: <QuestionCircleOutlined />, icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
okText: "退出登录", okText: "退出登录",
cancelText: "点错了", cancelText: "点错了",
onOk: () => { onOk: () => {
......
src/modules/root/Login.jsx
...@@ -77,6 +77,16 @@ function Login(props) { ...@@ -77,6 +77,16 @@ function Login(props) {
} }
function handleSubmit() { function handleSubmit() {
if (!phone) {
setPhoneError(true);
setErrorMessage("请输入手机号");
return;
}
if (phone.length != 11) {
setPhoneError(true);
setErrorMessage("请输入11位手机号")
return;
}
if(!phoneverify){ if(!phoneverify){
setErrorMessage("请输入验证码"); setErrorMessage("请输入验证码");
return; return;
...@@ -180,7 +190,7 @@ function Login(props) { ...@@ -180,7 +190,7 @@ function Login(props) {
</div> </div>
<div className="submit"> <div className="submit">
<div className="btn"> <div className="btn">
<button id='loginIn' onClick={ () => { handleSubmit() } }>登录</button> <button id='loginIn' onClick={ () => { handleSubmit() } } >登录</button>
</div> </div>
</div> </div>
</div> </div>
......
src/modules/store-manage/CourseCatalogPage.less
...@@ -3,6 +3,17 @@ ...@@ -3,6 +3,17 @@
thead{ thead{
display:none; display:none;
} }
tbody tr td{
border-bottom:none;
background:#FAFAFA;
}
// tr:hover td{
// background: #FAFAFA !important;
// }
// tbody tr:hover{
// background: #FAFAFA !important;
// }
} }
.divider-line{ .divider-line{
color: #BFBFBF; color: #BFBFBF;
...@@ -28,5 +39,10 @@ ...@@ -28,5 +39,10 @@
.empty-child{ .empty-child{
color:#666; color:#666;
font-size:14px; font-size:14px;
text-align:center;
background: #FAFAFA;
} }
// tr.ant-table-expanded-row:hover > td {
// background: #FAFAFA !important;
// }
} }
\ No newline at end of file
src/modules/store-manage/CourseCatalogPage.tsx
...@@ -58,7 +58,7 @@ function CourseCatalogPage() { ...@@ -58,7 +58,7 @@ function CourseCatalogPage() {
return confirm({ return confirm({
title: record.type==='parent'? '你确定要删除此分类吗？':'你确定要删除此子分类吗？', title: record.type==='parent'? '你确定要删除此分类吗？':'你确定要删除此子分类吗？',
content: record.type==='parent'? '删除后，此分类下包含的所有子分类都会被删除，此操作不可恢复。':'此操作不可恢复。', content: record.type==='parent'? '删除后，此分类下包含的所有子分类都会被删除，此操作不可恢复。':'此操作不可恢复。',
icon: <QuestionCircleOutlined />, icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
okText: '删除', okText: '删除',
okType: 'danger', okType: 'danger',
cancelText: '取消', cancelText: '取消',
...@@ -178,7 +178,7 @@ function CourseCatalogPage() { ...@@ -178,7 +178,7 @@ function CourseCatalogPage() {
pagination={false} pagination={false}
expandedRowRender={(record:RecordTypes) => { expandedRowRender={(record:RecordTypes) => {
if(!record.sonCategoryList){ if(!record.sonCategoryList){
return <div>还未添加任何子分类</div>; return <div className="empty-child">还未添加任何子分类</div>;
} }
if (record.sonCategoryList.length !== 0){ if (record.sonCategoryList.length !== 0){
return <Table columns={parseColumn()} dataSource={record.sonCategoryList} pagination={false} className="child-table"/> return <Table columns={parseColumn()} dataSource={record.sonCategoryList} pagination={false} className="child-table"/>
......
src/modules/store-manage/EmployeesManagePage.tsx
...@@ -206,7 +206,7 @@ function EmployeesManagePage() { ...@@ -206,7 +206,7 @@ function EmployeesManagePage() {
return confirm({ return confirm({
title: "你确定要删除此讲师吗？", title: "你确定要删除此讲师吗？",
content: "删除后，讲师将不能登录系统，此操作不能被撤销", content: "删除后，讲师将不能登录系统，此操作不能被撤销",
icon: <QuestionCircleOutlined />, icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
okText: "删除", okText: "删除",
cancelText: "取消", cancelText: "取消",
onOk: () => { onOk: () => {
......
src/modules/store-manege/StoreDecorationPage.tsx 0 → 100644
/*
* @Author: wufan
* @Date: 2020-11-30 10:47:38
* @LastEditors: wufan
* @LastEditTime: 2020-11-30 17:35:24
* @Description: 员工管理页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
import React, { useEffect, useState } from "react";
import { withRouter } from "react-router-dom";
import _ from "underscore";
import PageControl from "@/components/PageControl";
import {
Table,
Modal,
message,
Row,
Col,
Input,
DatePicker,
Button,
} from "antd";
import { QuestionCircleOutlined } from "@ant-design/icons";
import StoreService from "@/domains/store-domain/storeService";
import "./StoreDecorationPage.less";
import moment from "moment";
const { confirm } = Modal;
const { Search } = Input;
const { RangePicker } = DatePicker;
declare var window: any;
interface RecordTypes {
storeUserId: string;
role: string;
}
function StoreDecorationPage() {
const [storeDecorationlist, setStoreDecorationlist] = useState([
{
name: "赵云",
phone: "18767118672",
role: "0",
storeUserId: "",
},
{
name: "吕布",
phone: "18767118672",
role: "0",
storeUserId: "",
},
]);
const [query, setQuery] = useState({
current: 0,
size: 10,
name: "",
phone: "",
identity: "ALL",
instId: "1837447" || window.currentUserInstInfo.instId,
registerStartDate: null,
registerEndDate: null,
});
const [total, setTotal] = useState(0);
const [model, setModel] = useState(null);
const [isModalOpen, setIsModalOpen] = useState(false);
const [isManager, setIsManager] = useState(true);
const [isNormal, setIsNormal] = useState(true);
const [choosedItem, setChooseItem] = useState({});
useEffect(() => {
// getStoreDecorationList();
}, [query]);
function getStoreDecorationList() {
let _query = _.clone(query);
_query.current = query.current + 1;
StoreService.getStoreDecorationList(_query).then((res: any) => {
console.log(res.result.records);
setStoreDecorationlist(res.result.records);
setTotal(res.result.total);
});
}
function handleReplaceDecoration(record: RecordTypes) {}
function handleDeleteDecoration(record: RecordTypes) {}
function handleDeleteDecorationConfirm(record: RecordTypes) {
return confirm({
title: "你确定要删除这个banner吗？",
icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
okText: "删除",
cancelText: "取消",
onOk: () => {
handleDeleteDecoration(record);
},
});
}
function parseColumn() {
return [
{
title: "用户姓名",
dataIndex: "name",
render: (val: string) => {
return (
<div className="coupon-info">
<span className="title">{val}</span>
</div>
);
},
},
{
title: "手机号",
dataIndex: "phone",
key: "phone",
render: (val: string) => {
return <div>{val}</div>;
},
},
{
title: "注册时间",
dataIndex: "registerDate",
key: "registerDate",
render: (val: string) => {
return <div>{moment(val).format("YYYY-MM-DD HH:mm:ss")}</div>;
},
},
{
title: "操作",
dataIndex: "operation",
render: (val: string, record: RecordTypes) => {
return record.role === "" || record.role === "1" ? (
<div className="no-operate">-</div>
) : (
<div className="operation">
<span
className="edit"
onClick={() => handleReplaceDecoration(record)}
>
替换
</span>
<span className="divider-line">{" | "}</span>
<span
className="delete"
onClick={() => handleDeleteDecoration(record)}
>
删除
</span>
</div>
);
},
},
];
}
function handleQuery(name: string, value: any) {
const _query = _.clone(query);
// _query[name] = value;
setQuery(_query);
}
function handleToAddStoreDecoration() {}
return (
<div className="page user-manage-page">
<div className="page-content">
<div className="content-header">店铺装修</div>
<div className="box">
<div className="box-header">
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "space-between",
padding: "15px 0 10px",
}}
>
<div style={{ flex: 1 }}>banner设置</div>
</div>
<Button
onClick={() => {
handleToAddStoreDecoration();
}}
type="primary"
className="add-show-btn"
>
添加Banner
</Button>
</div>
<div className="box-body">
<Table
size={"middle"}
pagination={false}
dataSource={storeDecorationlist}
columns={parseColumn()}
rowKey={(item: any) => item.id}
bordered
/>
</div>
<div className="box-footer">
<PageControl
current={query.current}
pageSize={query.size}
total={total}
toPage={(page) => {
const queryStates = _.clone(query);
queryStates.current = page;
setQuery(queryStates);
}}
/>
</div>
</div>
</div>
</div>
);
}
export default withRouter(StoreDecorationPage);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment