Skip to content

Commit d952fb2

Browse files
committed
fix:env-mock模式
1 parent e651e9b commit d952fb2

File tree

5 files changed

+30
-39
lines changed

5 files changed

+30
-39
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
请输入服务器地址-> http://192.168.1.147:8080
1717
npm install
1818
npm run dev 即可启动项目
19-
npm run mock 可使用mock启动
19+
.env文件控制请求接口 1mock数据
2020
```
2121

2222
### 推荐的项目目录结构

example/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VUE_APP_MOCK = 1
1+
VUE_APP_MOCK = 0

example/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
npm install
66
```
77

8-
### Compiles and hot-reloads and mockJs for development
9-
```
10-
npm run mock
11-
```
12-
138
### Compiles and hot-reloads for development
149
```
1510
npm run serve

example/src/axios/api.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,76 +29,76 @@ class Api {
2929
* 修改用户信息
3030
* @param formData 用户信息
3131
*/
32-
changeUserInfo = (formData: unknown) => axios.post('./api/user/changeUserInfo', formData)
32+
changeUserInfo = (formData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.changeUserName : './api/user/changeUserInfo', formData)
3333

3434
/**
3535
* 创建学生&教师
3636
* @param formData 创建学生&教师
3737
*/
38-
createClassMember = (formData: unknown) => axios.post('./api/classMember/createClassMember', formData)
38+
createClassMember = (formData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.createUser : './api/classMember/createClassMember', formData)
3939

4040
/**
4141
* 查询用户列表
4242
* @param searchData 查询条件
4343
*/
44-
queryUserList = (searchData: unknown) => axios.post('./api/user/queryUserList', searchData)
44+
queryUserList = (searchData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.getUserList : './api/user/queryUserList', searchData)
4545

4646
/**
4747
* 查询学生列表
4848
* @param searchData
4949
*/
50-
queryStudentList = (searchData: unknown) => axios.post('./api/classMember/listStudent', searchData)
50+
queryStudentList = (searchData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.getStudentList : './api/classMember/listStudent', searchData)
5151

5252
/**
5353
* 重置用户密码
5454
* @param BaseUserCodeRequest code
5555
*/
56-
adminResetPassword = (BaseUserCodeRequest: string) => axios.post('./api/user/adminResetPassword', { code: BaseUserCodeRequest })
56+
adminResetPassword = (BaseUserCodeRequest: string) => axios.post(this.VUE_APP_MOCK ? mockpath.resetPassword : './api/user/adminResetPassword', { code: BaseUserCodeRequest })
5757

5858
/**
5959
* 删除学生
6060
* @param formData
6161
*/
62-
delStudent = (formData: unknown) => axios.post('./api/userManage/delStudent', formData)
62+
delStudent = (formData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.delteStudent : './api/userManage/delStudent', formData)
6363

6464
/**
6565
* 删除教师
6666
* @param formData
6767
*/
68-
delTeacher = (formData: unknown) => axios.post('./api/userManage/delTeacher', formData)
68+
delTeacher = (formData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.delteTeacher : './api/userManage/delTeacher', formData)
6969

7070
/**
7171
* 更改个人信息
7272
* @param formData
7373
*/
74-
changeUserSignature = (formData: unknown) => axios.post('./api/user/changeUserSignature', formData)
74+
changeUserSignature = (formData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.changeUserSignatures : './api/user/changeUserSignature', formData)
7575

7676
/**
7777
* 修改密码
7878
* @param formData
7979
*/
80-
changePassword = (formData: unknown) => axios.post('./api/user/changePassword', formData)
80+
changePassword = (formData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.changePasswords : './api/user/changePassword', formData)
8181

8282
/**
8383
* 查询班级列表
8484
* @param searchData
8585
*/
86-
getClassList = (searchData: unknown) => axios.post('./api/class/queryClass', searchData)
86+
getClassList = (searchData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.getClassList : './api/class/queryClass', searchData)
8787

8888
/**
8989
* 编辑&创建班级
9090
* @param formData
9191
*/
92-
editClassData = (formData: unknown) => axios.post('./api/class/createOrUpdateClass', formData)
92+
editClassData = (formData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.editClass : './api/class/createOrUpdateClass', formData)
9393

9494
/**
9595
* 删除班级
9696
* @param formData
9797
*/
98-
delClass = (formData: unknown) => axios.post('./api/userManage/delClass', formData)
98+
delClass = (formData: unknown) => axios.post(this.VUE_APP_MOCK ? mockpath.delClass : './api/userManage/delClass', formData)
9999

100100
/**
101-
* 导入学生
101+
* 导入学生——没有处理mock
102102
* @param formData
103103
* @param classId 班级id
104104
*/

example/src/mock/mock_api.ts

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,35 @@ import {
1313
import { changeUserSignatures, changePasswords } from './modules/public/userInfo';
1414

1515
export default class MockPath {
16-
login = './api/user/login';
16+
login = './mock/user/login';
1717

18-
getByCode = './api/user/getByCode';
18+
getByCode = './mock/user/getByCode';
1919

20-
getClassList = './api/class/queryClass'
20+
getClassList = './mock/class/queryClass'
2121

22-
editClass = './api/class/createOrUpdateClass'
22+
editClass = './mock/class/createOrUpdateClass'
2323

24-
delClass = './api/userManage/delClass'
24+
delClass = './mock/userManage/delClass'
2525

26-
insertStudent = './api/classMember/insertStudent'
26+
insertStudent = './mock/classMember/insertStudent'
2727

28-
getUserList = './api/user/queryUserList'
28+
getUserList = './mock/user/queryUserList'
2929

30-
getStudentList = './api/classMember/listStudent'
30+
getStudentList = './mock/classMember/listStudent'
3131

32-
resetPassword = './api/user/adminResetPassword'
32+
resetPassword = './mock/user/adminResetPassword'
3333

34-
delteTeacher = './api/userManage/delTeacher'
34+
delteTeacher = './mock/userManage/delTeacher'
3535

36-
delteStudent = './api/userManage/delStudent'
36+
delteStudent = './mock/userManage/delStudent'
3737

38-
changeUserName = './api/user/changeUserInfo'
38+
changeUserName = './mock/user/changeUserInfo'
3939

40-
createUser = './api/classMember/createClassMember'
40+
createUser = './mock/classMember/createClassMember'
4141

42-
changeUserSignatures = './api/user/changeUserSignature'
42+
changeUserSignatures = './mock/user/changeUserSignature'
4343

44-
changePasswords = './api/user/changePassword'
44+
changePasswords = './mock/user/changePassword'
4545
}
4646

4747
const mockPath = new MockPath();
@@ -59,8 +59,6 @@ Mock.mock(mockPath.insertStudent, 'post', insertStudent);
5959
Mock.mock(mockPath.getUserList, 'post', getUserList);
6060
// 学生列表
6161
Mock.mock(mockPath.getStudentList, 'post', getStudentList);
62-
// 获取班级列表
63-
// Mock.mock('./api/class/queryClass', 'post', getClassList);
6462
// 重置密码
6563
Mock.mock(mockPath.resetPassword, 'post', resetPassword);
6664
// 删除教师
@@ -71,8 +69,6 @@ Mock.mock(mockPath.delteStudent, 'post', delteStudent);
7169
Mock.mock(mockPath.changeUserName, 'post', changeUserName);
7270
// 添加用户
7371
Mock.mock(mockPath.createUser, 'post', createUser);
74-
// 获取用户信息
75-
// Mock.mock('./api/user/getByCode', 'post', getCode);
7672
// 更改个人信息
7773
Mock.mock(mockPath.changeUserSignatures, 'post', changeUserSignatures);
7874
// 修改密码

0 commit comments

Comments
 (0)