Skip to content

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

feat:更改接口的名称

parent 42b977ca
Showing with 163 additions and 149 deletions
src/modules/personalInfo/index.tsx
/* /*
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2020-11-27 15:06:31 * @Date: 2020-11-27 15:06:31
* @LastEditors: wufan * @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-07 20:09:22 * @LastEditTime: 2020-12-08 11:55:09
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -42,11 +42,14 @@ function PersonalInfoPage() { ...@@ -42,11 +42,14 @@ function PersonalInfoPage() {
storeUserId:User.getStoreUserId() storeUserId:User.getStoreUserId()
} }
BaseService.getStoreUser(param).then((res) => { BaseService.getStoreUser(param).then((res) => {
const {nickName,phone,roleCodes,avatar} = res.result; const {nickName,phone,roleCodes} = res.result;
setNickName(nickName); setNickName(nickName);
setPhone(phone); setPhone(phone);
setRoleCodes(roleCodes) setRoleCodes(roleCodes)
setAvatar(avatar) if(res.result.avatar){
setAvatar(res.result.avatar)
}
}); });
} }
function _handleUpdateAvatar(e: any): any { function _handleUpdateAvatar(e: any): any {
......
src/modules/root/Login.jsx
...@@ -49,7 +49,7 @@ function Login(props) { ...@@ -49,7 +49,7 @@ function Login(props) {
scene: 'nc_login', scene: 'nc_login',
serverType: "CLOUD_CLASS_LOGIN", serverType: "CLOUD_CLASS_LOGIN",
} }
axios.post('https://dev-heimdall.xiaomai5.com/hades/anon/store/sendLoginAuthCode', params).then((res) => { axios.post('https://dev-heimdall.xiaomai5.com/hades/anon/hades/sendLoginAuthCode', params).then((res) => {
if (!res.data.success) { if (!res.data.success) {
setErrorMessage(res.data.message); setErrorMessage(res.data.message);
} else { } else {
...@@ -84,7 +84,7 @@ function Login(props) { ...@@ -84,7 +84,7 @@ function Login(props) {
authCode:phoneverify, authCode:phoneverify,
appTermEnum:"XIAOMAI_CLOUD_CLASS_PC_WEB" appTermEnum:"XIAOMAI_CLOUD_CLASS_PC_WEB"
} }
axios.post('https://dev-heimdall.xiaomai5.com/hades/anon/store/login', params).then((res) => { axios.post('https://dev-heimdall.xiaomai5.com/hades/anon/hades/login', params).then((res) => {
const data = res.data; const data = res.data;
if (!data.success) { if (!data.success) {
setErrorMessage(data.message); setErrorMessage(data.message);
......
src/modules/store-manege/CourseCatalogPage.tsx
...@@ -37,6 +37,7 @@ function CourseCatalogPage() { ...@@ -37,6 +37,7 @@ function CourseCatalogPage() {
const [secondCatalogModalType,setSecondCatalogModalType] = useState(''); const [secondCatalogModalType,setSecondCatalogModalType] = useState('');
const [parentCatalogId,setParentCatalogId] = useState(''); const [parentCatalogId,setParentCatalogId] = useState('');
const [choosedItem, setChooseItem] = useState({}); const [choosedItem, setChooseItem] = useState({});
const [expandedRowKeys,setexpandedRowKeys] =useState('');
useEffect(() => { useEffect(() => {
getCourseCatalogList(); getCourseCatalogList();
}, [query]); }, [query]);
...@@ -71,29 +72,30 @@ function CourseCatalogPage() { ...@@ -71,29 +72,30 @@ function CourseCatalogPage() {
categoryId:record.id categoryId:record.id
} }
StoreService.delCourseCategory(param).then((res: any) =>{ StoreService.delCourseCategory(param).then((res: any) =>{
if(record.type ==='parent'){ getCourseCatalogList();
let _courseCatalogList:any = [...courseCatalogList]; // if(record.type ==='parent'){
for(let i=0;i<_courseCatalogList.length;i++){ // let _courseCatalogList:any = [...courseCatalogList];
if(_courseCatalogList[i].id === record.id){ // for(let i=0;i<_courseCatalogList.length;i++){
_courseCatalogList.splice(i,1); // if(_courseCatalogList[i].id === record.id){
} // _courseCatalogList.splice(i,1);
} // }
setCourseCatalogList(_courseCatalogList); // }
setTotal(_courseCatalogList.length); // setCourseCatalogList(_courseCatalogList);
}else{ // setTotal(_courseCatalogList.length);
let _courseCatalogListClone:any = JSON.parse(JSON.stringify(courseCatalogList)); // getCourseCatalogList();
for(let i=0;i<_courseCatalogListClone.length;i++){ // }else{
if(_courseCatalogListClone[i].child){ // let _courseCatalogListClone:any = JSON.parse(JSON.stringify(courseCatalogList));
for(let j=0;j<_courseCatalogListClone[i].child.length;j++){ // for(let i=0;i<_courseCatalogListClone.length;i++){
if(_courseCatalogListClone[i].child[j].id === record.id){ // if(_courseCatalogListClone[i].child){
_courseCatalogListClone[i].child.splice(j,1); // for(let j=0;j<_courseCatalogListClone[i].child.length;j++){
} // if(_courseCatalogListClone[i].child[j].id === record.id){
} // _courseCatalogListClone[i].child.splice(j,1);
} // }
} // }
setCourseCatalogList(_courseCatalogListClone) // }
} // }
// setCourseCatalogList(_courseCatalogListClone)
// }
message.success("分类已删除"); message.success("分类已删除");
}); });
} }
...@@ -149,84 +151,91 @@ function CourseCatalogPage() { ...@@ -149,84 +151,91 @@ function CourseCatalogPage() {
setTotal(res.result.total); setTotal(res.result.total);
}); });
} }
function refreshCatalogList(data:any):any{ // function refreshCatalogList(data:any):any{
let _courseCatalogList:any = [...courseCatalogList]; // let _courseCatalogList:any = [...courseCatalogList];
const { type} = data; // const { type} = data;
switch (type){ // switch (type){
case 'addCatalog': // case 'addCatalog':
const item = { // const item = {
categoryName:data.catalogName, // categoryName:data.catalogName,
id:data.id, // id:data.id,
hasSon:false, // hasSon:false,
key:data.id, // key:data.id,
type:'parent' // type:'parent'
} // }
_courseCatalogList.push(item); // _courseCatalogList.push(item);
setCourseCatalogList(_courseCatalogList); // setTotal(_courseCatalogList.length);
setTotal(_courseCatalogList.length); // if(_courseCatalogList.length>10){
break; // setCourseCatalogList(_courseCatalogList.splice(0,9));
case 'editCatalog': // }else{
_courseCatalogList.map((item:any,index:any)=>{ // setCourseCatalogList(_courseCatalogList);
if(item.id === data.id){ // }
item.categoryName = data.catalogName // // getCourseCatalogList();
} // break;
return item // case 'editCatalog':
}); // _courseCatalogList.map((item:any,index:any)=>{
setCourseCatalogList(_courseCatalogList) // if(item.id === data.id){
break; // item.categoryName = data.catalogName
case 'addSecondCatalog': // }
const secondItem = { // return item
categoryName:data.catalogName, // });
id:data.id, // setCourseCatalogList(_courseCatalogList)
key:data.id // break;
} // case 'addSecondCatalog':
let _courseCatalogListClone:any = JSON.parse(JSON.stringify(courseCatalogList)); // const secondItem = {
_courseCatalogListClone.map((item:any,index:any)=>{ // categoryName:data.catalogName,
if(item.id === data.parentId){ // id:data.id,
if(!item.child){ // key:data.id
item.child=[]; // }
} // let _courseCatalogListClone:any = JSON.parse(JSON.stringify(courseCatalogList));
item.child.push(secondItem) // _courseCatalogListClone.map((item:any,index:any)=>{
} // if(item.id === data.parentId){
return item // if(!item.child){
}); // item.child=[];
setCourseCatalogList(_courseCatalogListClone) // }
break; // item.child.push(secondItem)
case 'editSecondCatalog': // }
const secondEditItem = { // return item
categoryName:data.catalogName, // });
id:data.id, // setCourseCatalogList(_courseCatalogListClone)
key:data.id // break;
} // case 'editSecondCatalog':
let _courseCatalogListEditClone:any = JSON.parse(JSON.stringify(courseCatalogList)); // const secondEditItem = {
_courseCatalogListEditClone.map((item:any,index:any)=>{ // categoryName:data.catalogName,
if(item.id === data.parentId){ // id:data.id,
if(item.child){ // key:data.id
item.child.map((_item:any,_index:any)=>{ // }
if(_item.id === data.id){ // let _courseCatalogListEditClone:any = JSON.parse(JSON.stringify(courseCatalogList));
_item.categoryName =data.catalogName; // _courseCatalogListEditClone.map((item:any,index:any)=>{
} // if(item.id === data.parentId){
}) // if(item.child){
} // item.child.map((_item:any,_index:any)=>{
// if(_item.id === data.id){
} // _item.categoryName =data.catalogName;
return item // }
}); // })
break; // }
default: // }
break; // return item
} // });
} // break;
// default:
// break;
// }
// }
function handleCatalogListData(listData:any){ function handleCatalogListData(listData:any){
listData.map((item:any,index:any) => { listData.map((item:any,index:any) => {
item.type = "parent" item.type = "parent"
item.key = item.id; item.key = item.id;
item.child = []; // item.child.map((_item:any,_index:any) =>{
// _item.type = "child";
// _item.key=_item.id
// return _item
// });
return item return item
}) })
return listData
return listData
} }
function editCatalog(record:any){ function editCatalog(record:any){
...@@ -239,21 +248,22 @@ function CourseCatalogPage() { ...@@ -239,21 +248,22 @@ function CourseCatalogPage() {
} }
setChooseItem(record); setChooseItem(record);
} }
function expandSecondCatalog(expanded:boolean,record:any){ // function expandSecondCatalog(expanded:boolean,record:any){
const parentId = record.id; // const parentId = record.id;
const param = { // const param = {
parentId, // parentId,
} // }
StoreService.getAllSonCategory(param).then((res: any) => { // StoreService.getAllSonCategory(param).then((res: any) => {
record.child= res.result || []; // record.child= res.result || [];
record.child.map((item:any,index:any) => { // record.child.map((item:any,index:any) => {
item.key= item.id // item.key= item.id
return item // return item
}) // })
const _courseCatalogList =[...courseCatalogList]; // const _courseCatalogList =[...courseCatalogList];
setCourseCatalogList(_courseCatalogList) // setCourseCatalogList(_courseCatalogList);
}); // return
} // });
// }
return ( return (
...@@ -276,10 +286,9 @@ function CourseCatalogPage() { ...@@ -276,10 +286,9 @@ function CourseCatalogPage() {
pagination={false} pagination={false}
expandedRowRender={(record:RecordTypes) => { expandedRowRender={(record:RecordTypes) => {
if(!record.child){ if(!record.child){
return return <div>还未添加任何子分类</div>;
} }
if (record.child.length !== 0){ if (record.child.length !== 0){
console.log("record.child",record.child);
return <Table columns={parseColumn()} dataSource={record.child} pagination={false} className="child-table"/> return <Table columns={parseColumn()} dataSource={record.child} pagination={false} className="child-table"/>
// return <div>{ // return <div>{
// record.child.map((item:any,index:any)=>{ // record.child.map((item:any,index:any)=>{
...@@ -292,7 +301,7 @@ function CourseCatalogPage() { ...@@ -292,7 +301,7 @@ function CourseCatalogPage() {
} }
}} }}
dataSource={courseCatalogList} dataSource={courseCatalogList}
onExpand={(expanded, record)=>expandSecondCatalog(expanded, record)} // onExpand={(expanded, record)=>expandSecondCatalog(expanded, record)}
/> />
</div> </div>
<div className="box-footer"> <div className="box-footer">
...@@ -310,10 +319,10 @@ function CourseCatalogPage() { ...@@ -310,10 +319,10 @@ function CourseCatalogPage() {
</div> </div>
</div> </div>
{ {
catalogModalVisible && <CatalogAddOrEditModal modalType={catalogModalType} onClose={()=>{setCatalogModalVisible(false)}} refreshCatalogList={refreshCatalogList} choosedItem={choosedItem}/> catalogModalVisible && <CatalogAddOrEditModal modalType={catalogModalType} onClose={()=>{setCatalogModalVisible(false)}} refreshCatalogList={getCourseCatalogList} choosedItem={choosedItem}/>
} }
{ {
secondCatalogModalVisible && <SecondCatalogAddOrEditModal modalType={secondCatalogModalType} parentId={parentCatalogId} onClose={()=>{setSecondCatalogModalVisible(false)}} choosedItem={choosedItem} refreshCatalogList={refreshCatalogList} /> secondCatalogModalVisible && <SecondCatalogAddOrEditModal modalType={secondCatalogModalType} parentId={parentCatalogId} onClose={()=>{setSecondCatalogModalVisible(false)}} choosedItem={choosedItem} refreshCatalogList={getCourseCatalogList} />
} }
</div> </div>
</div> </div>
......
src/modules/store-manege/modal/CatalogAddOrEditModal.tsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: wufan * @Author: wufan
* @Date: 2020-11-27 16:21:49 * @Date: 2020-11-27 16:21:49
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-07 19:05:11 * @LastEditTime: 2020-12-08 14:12:20
* @Description: Description * @Description: Description
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -36,13 +36,14 @@ function CatalogAddOrEditModal(props: CatalogAddOrEditModalProps) { ...@@ -36,13 +36,14 @@ function CatalogAddOrEditModal(props: CatalogAddOrEditModalProps) {
categoryName:catalogName categoryName:catalogName
} }
StoreService.addCourseCategory(param).then((res: any) => { StoreService.addCourseCategory(param).then((res: any) => {
// const data = {
// type:'addCatalog',
// catalogName:catalogName,
// id:res.result
// }
refreshCatalogList();
onClose(); onClose();
const data = {
type:'addCatalog',
catalogName:catalogName,
id:res.result
}
refreshCatalogList(data);
}); });
} }
function editCatalog():any{ function editCatalog():any{
...@@ -51,12 +52,12 @@ function CatalogAddOrEditModal(props: CatalogAddOrEditModalProps) { ...@@ -51,12 +52,12 @@ function CatalogAddOrEditModal(props: CatalogAddOrEditModalProps) {
categoryName: catalogName, categoryName: catalogName,
} }
StoreService.editCourseCategory(param).then((res: any) => { StoreService.editCourseCategory(param).then((res: any) => {
const data = { // const data = {
type:'editCatalog', // type:'editCatalog',
catalogName:catalogName, // catalogName:catalogName,
id:choosedItem.id // id:choosedItem.id
} // }
refreshCatalogList(data); refreshCatalogList();
onClose(); onClose();
}); });
} }
......
src/modules/store-manege/modal/SecondCatalogAddOrEditModal.tsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: wufan * @Author: wufan
* @Date: 2020-11-27 16:21:49 * @Date: 2020-11-27 16:21:49
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-07 19:51:03 * @LastEditTime: 2020-12-08 14:11:44
* @Description: Description * @Description: Description
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -26,7 +26,7 @@ interface SecondCatalogAddOrEditModalProps { ...@@ -26,7 +26,7 @@ interface SecondCatalogAddOrEditModalProps {
function SecondCatalogAddOrEditModal(props: SecondCatalogAddOrEditModalProps) { function SecondCatalogAddOrEditModal(props: SecondCatalogAddOrEditModalProps) {
const {onClose,modalType,parentId,refreshCatalogList,choosedItem} = props; const {onClose,modalType,parentId,refreshCatalogList,choosedItem} = props;
const [secondCatalogName,setSecondCatalogName] = useState(''); const [secondCatalogName,setSecondCatalogName] = useState(choosedItem.categoryName);
const [selectParentId,setSelectParentId] = useState(parentId); const [selectParentId,setSelectParentId] = useState(parentId);
const [optionList,setOptionList] = useState([]); const [optionList,setOptionList] = useState([]);
const [query, setQuery] = useState({ const [query, setQuery] = useState({
...@@ -58,13 +58,13 @@ function SecondCatalogAddOrEditModal(props: SecondCatalogAddOrEditModalProps) { ...@@ -58,13 +58,13 @@ function SecondCatalogAddOrEditModal(props: SecondCatalogAddOrEditModalProps) {
categoryName:secondCatalogName categoryName:secondCatalogName
} }
StoreService.addCourseCategory(param).then((res: any) => { StoreService.addCourseCategory(param).then((res: any) => {
const data = { // const data = {
type:'addSecondCatalog', // type:'addSecondCatalog',
catalogName:secondCatalogName, // catalogName:secondCatalogName,
parentId:selectParentId, // parentId:selectParentId,
id:res.result // id:res.result
} // }
refreshCatalogList(data); refreshCatalogList();
onClose(); onClose();
}); });
} }
...@@ -75,13 +75,13 @@ function SecondCatalogAddOrEditModal(props: SecondCatalogAddOrEditModalProps) { ...@@ -75,13 +75,13 @@ function SecondCatalogAddOrEditModal(props: SecondCatalogAddOrEditModalProps) {
categoryName: secondCatalogName, categoryName: secondCatalogName,
} }
StoreService.editCourseCategory(param).then((res: any) => { StoreService.editCourseCategory(param).then((res: any) => {
const data = { // const data = {
type:'editSecondCatalog', // type:'editSecondCatalog',
catalogName:secondCatalogName, // catalogName:secondCatalogName,
id:choosedItem.id, // id:choosedItem.id,
parentId:selectParentId, // parentId:selectParentId,
} // }
refreshCatalogList(data); refreshCatalogList();
onClose(); onClose();
}); });
} }
...@@ -119,6 +119,7 @@ function SecondCatalogAddOrEditModal(props: SecondCatalogAddOrEditModalProps) { ...@@ -119,6 +119,7 @@ function SecondCatalogAddOrEditModal(props: SecondCatalogAddOrEditModalProps) {
placeholder="请输入子分类名称，最多10个字" placeholder="请输入子分类名称，最多10个字"
maxLength={10} maxLength={10}
style={{ width: 240 }} style={{ width: 240 }}
value={secondCatalogName}
onChange={(e) => { onChange={(e) => {
setSecondCatalogName(e.target.value); setSecondCatalogName(e.target.value);
}} }}
......
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