diff --git a/src/pages/exam/components/item.less b/src/pages/exam/components/list/item.less
similarity index 85%
rename from src/pages/exam/components/item.less
rename to src/pages/exam/components/list/item.less
index 4c65c2bdf582807193e4ec220fb3252ec1d69e98..acbf178a8ba6463ddc01ff37cdca666502675625 100644
--- a/src/pages/exam/components/item.less
+++ b/src/pages/exam/components/list/item.less
@@ -13,7 +13,7 @@
}
display: flex;
justify-content: space-between;
- padding: @space-xxxs @space-xxs;
+ margin-bottom: 16px;
img {
border-radius: 5px;
width: 120px;
@@ -23,11 +23,12 @@
display: flex;
flex-direction: column;
justify-content: space-between;
- padding-left: @space-xxxs;
+ padding: 4px 0 4px 16px;
.title {
font-size: @space-sm;
- font-weight: 500;
+ font-weight: 600;
color: @item-title-color;
+ line-height: 1.5;
}
.action {
display: flex;
diff --git a/src/pages/exam/components/select/index.js b/src/pages/exam/components/select/index.js
index 5d7ea894dd7e636d97575df043955eeee74fa3bc..1c9f4ab5cc3ed9be84b12778f390b256b2574830 100644
--- a/src/pages/exam/components/select/index.js
+++ b/src/pages/exam/components/select/index.js
@@ -2,9 +2,7 @@ import React, { useState } from 'react';
import router from 'umi/router';
import styles from './index.less';
-import config from '@/config';
import { Button } from 'antd-mobile';
-import classNames from 'classNames';
import Option from './option';
const Index = ({ type = 0, analysis, title, total, no, rightAnswer, optionList = [] }) => {
const [isShowAnswer, setIsShowAnswer] = useState(false);
@@ -18,7 +16,6 @@ const Index = ({ type = 0, analysis, title, total, no, rightAnswer, optionList =
router.push('/exam/question/submit/analysis/0');
};
- const selectOption = () => {};
const handleSelect = (id, isSelected) => {
options.forEach(item => {
diff --git a/src/pages/exam/components/written/index.js b/src/pages/exam/components/written/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..ec67014b516dccb95064af354a3678eed8017b80
--- /dev/null
+++ b/src/pages/exam/components/written/index.js
@@ -0,0 +1,65 @@
+import React, { useState } from 'react';
+import router from 'umi/router';
+import { Button, InputItem, TextareaItem } from 'antd-mobile';
+
+import styles from './index.less';
+const Index = ({ type = 3, no, total, title, analysis, rightAnswer }) => {
+ const [isShowAnswer, setIsShowAnswer] = useState(false);
+
+ const showAnswer = () => {
+ setIsShowAnswer(true);
+ };
+
+ const goSubmitAnalysis = () => {
+ router.push('/exam/question/submit/analysis/0');
+ };
+
+ return (
+
+
+
+ {no}/{total}、{title}
+
+
+ {type === 3 && (
+
+
+
+ )}
+ {(type === 4 || type === 6 || type === 8 || type === 9) && (
+
+
+
+ )}
+
+ {isShowAnswer && (
+
+
正确答案为:{rightAnswer}
+
+ 题型解析:{analysis}
+
+
+ 我要解析
+
+
+ )}
+ {!isShowAnswer && (
+
+
+
+ )}
+
+
+
上一题
+
+ 跳转到
+ 题
+
+
下一题
+
+
+ );
+};
+export default Index;
diff --git a/src/pages/exam/components/written/index.less b/src/pages/exam/components/written/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..e917ef4a074522299f561001a61d802eb3d0c433
--- /dev/null
+++ b/src/pages/exam/components/written/index.less
@@ -0,0 +1,117 @@
+.root {
+ height: 100%;
+ font-size: 16px;
+ padding: 16px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ .content {
+ .title {
+ color: #202030;
+ font-weight: 600;
+ line-height: 1.5;
+ }
+
+ .paper {
+ padding: 32px 0 48px;
+ :global {
+ .am-list-item {
+ padding-left: 0;
+ }
+ .am-list-line {
+ padding-right: 0;
+ }
+ .am-input-control {
+ height: 44px;
+ background: rgba(250, 250, 250, 1);
+ border-radius: 4px;
+ }
+ }
+
+ .input {
+ input {
+ line-height: 44px;
+ padding-left: 16px;
+ }
+ }
+
+ .textarea {
+ textarea {
+ background: rgba(250, 250, 250, 1);
+ border-radius: 4px;
+ padding-top: 8px;
+ padding-left: 16px;
+ }
+ }
+ }
+
+ .submit {
+ :global {
+ .am-button {
+ line-height: 40px;
+ font-size: 16px;
+ width: 105px;
+ height: 40px;
+ background: linear-gradient(270deg, rgba(23, 106, 254, 1) 0%, rgba(97, 159, 255, 1) 100%);
+ border-radius: 20px;
+ }
+ }
+ }
+
+ .answer {
+ .rightAnswer {
+ margin-bottom: 16px;
+ color: #3dc484;
+ }
+ .analysis {
+ margin-bottom: 16px;
+ font-size: 14px;
+ color: #202030;
+ line-height: 1.5;
+ span {
+ font-weight: 600;
+ }
+ }
+ .goAnalysis {
+ text-align: right;
+ color: #176aff;
+ }
+ }
+ }
+ .action {
+ display: flex;
+ justify-content: space-between;
+ font-size: 14px;
+ .pre {
+ width: 72px;
+ height: 32px;
+ background: #f9f9f9;
+ border-radius: 16px;
+ color: #cccccc;
+ font-weight: 600;
+ line-height: 32px;
+ text-align: center;
+ }
+ .input {
+ input {
+ width: 36px;
+ height: 26px;
+ border-radius: 4px;
+ border: 1px solid #eff4fe;
+ color: #176aff;
+ font-weight: 500;
+ margin: 0 12px;
+ }
+ }
+ .next {
+ width: 72px;
+ height: 32px;
+ line-height: 32px;
+ background: #e3edfe;
+ border-radius: 16px;
+ color: #176aff;
+ font-weight: 600;
+ text-align: center;
+ }
+ }
+}
diff --git a/src/pages/exam/question/analytical/index.js b/src/pages/exam/question/analytical/index.js
index 47290c89f160807e53ec5616be4cb8f83daac01e..9f14829795c10e9610065bf98dd8307282d5d2a4 100644
--- a/src/pages/exam/question/analytical/index.js
+++ b/src/pages/exam/question/analytical/index.js
@@ -1,10 +1,10 @@
import React from 'react';
-import Select from '../../components/select';
+import Written from '../../components/written';
import styles from './index.less';
const Index = () => {
const opt = {
- type:1,
+ type:9,
no: 1,
total: 213,
title:
@@ -43,7 +43,7 @@ const Index = () => {
};
return (
<>
-
+
>
);
};
diff --git a/src/pages/exam/question/argumentation/index.js b/src/pages/exam/question/argumentation/index.js
index 47290c89f160807e53ec5616be4cb8f83daac01e..ceccc9b4abc91d64d84d5e10b75e060c299843a5 100644
--- a/src/pages/exam/question/argumentation/index.js
+++ b/src/pages/exam/question/argumentation/index.js
@@ -1,10 +1,10 @@
import React from 'react';
-import Select from '../../components/select';
+import Written from '../../components/written';
import styles from './index.less';
const Index = () => {
const opt = {
- type:1,
+ type:4,
no: 1,
total: 213,
title:
@@ -43,7 +43,7 @@ const Index = () => {
};
return (
<>
-
+
>
);
};
diff --git a/src/pages/exam/question/caseChoice/index.js b/src/pages/exam/question/caseChoice/index.js
index 47290c89f160807e53ec5616be4cb8f83daac01e..ceccc9b4abc91d64d84d5e10b75e060c299843a5 100644
--- a/src/pages/exam/question/caseChoice/index.js
+++ b/src/pages/exam/question/caseChoice/index.js
@@ -1,10 +1,10 @@
import React from 'react';
-import Select from '../../components/select';
+import Written from '../../components/written';
import styles from './index.less';
const Index = () => {
const opt = {
- type:1,
+ type:4,
no: 1,
total: 213,
title:
@@ -43,7 +43,7 @@ const Index = () => {
};
return (
<>
-
+
>
);
};
diff --git a/src/pages/exam/question/caseMultiple/index.js b/src/pages/exam/question/caseMultiple/index.js
index 47290c89f160807e53ec5616be4cb8f83daac01e..a54701e1d036f961ae47a1b34c769fe75b6371f2 100644
--- a/src/pages/exam/question/caseMultiple/index.js
+++ b/src/pages/exam/question/caseMultiple/index.js
@@ -1,10 +1,10 @@
import React from 'react';
-import Select from '../../components/select';
+import Written from '../../components/written';
import styles from './index.less';
const Index = () => {
const opt = {
- type:1,
+ type:8,
no: 1,
total: 213,
title:
@@ -43,7 +43,7 @@ const Index = () => {
};
return (
<>
-
+
>
);
};
diff --git a/src/pages/exam/question/completion/index.js b/src/pages/exam/question/completion/index.js
index 47290c89f160807e53ec5616be4cb8f83daac01e..e331208b1b627225c15f069c967cb3ffd56fd739 100644
--- a/src/pages/exam/question/completion/index.js
+++ b/src/pages/exam/question/completion/index.js
@@ -1,10 +1,10 @@
import React from 'react';
-import Select from '../../components/select';
+import Written from '../../components/written';
import styles from './index.less';
const Index = () => {
const opt = {
- type:1,
+ type:3,
no: 1,
total: 213,
title:
@@ -43,7 +43,7 @@ const Index = () => {
};
return (
<>
-
+
>
);
};
diff --git a/src/pages/exam/question/list.js b/src/pages/exam/question/list/index.js
similarity index 98%
rename from src/pages/exam/question/list.js
rename to src/pages/exam/question/list/index.js
index 75f85d99ed9db80d4840bf1e44bc556171b5be80..5dc7f0876cb04414c9d37a02fc40e68934a3a351 100644
--- a/src/pages/exam/question/list.js
+++ b/src/pages/exam/question/list/index.js
@@ -1,5 +1,5 @@
import React from 'react';
-import styles from './list.less';
+import styles from './index.less';
import router from 'umi/router';
const images = [
diff --git a/src/pages/exam/question/list.less b/src/pages/exam/question/list/index.less
similarity index 100%
rename from src/pages/exam/question/list.less
rename to src/pages/exam/question/list/index.less
diff --git a/src/pages/exam/question/short/index.js b/src/pages/exam/question/short/index.js
index 47290c89f160807e53ec5616be4cb8f83daac01e..dade12b7abf33db1849cffa13496c09f0d521689 100644
--- a/src/pages/exam/question/short/index.js
+++ b/src/pages/exam/question/short/index.js
@@ -1,10 +1,10 @@
import React from 'react';
-import Select from '../../components/select';
+import Written from '../../components/written';
import styles from './index.less';
const Index = () => {
const opt = {
- type:1,
+ type:6,
no: 1,
total: 213,
title:
@@ -43,7 +43,7 @@ const Index = () => {
};
return (
<>
-
+
>
);
};
diff --git a/src/pages/profile/balance/index.js b/src/pages/profile/balance/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/pages/profile/balance/index.less b/src/pages/profile/balance/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/pages/profile/basic/index.js b/src/pages/profile/basic/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/pages/profile/basic/index.less b/src/pages/profile/basic/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/pages/profile/basic/phone.js b/src/pages/profile/basic/phone.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/pages/profile/components/list/index.js b/src/pages/profile/components/list/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..2fd936b7ca3f54d937de8fb7efab24c27f0af30b
--- /dev/null
+++ b/src/pages/profile/components/list/index.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import Item from './item';
+
+import styles from './index.less';
+
+const Index = ({ dataSource=[]}) => {
+ const renderItem = () => {
+ return dataSource.map(x => (
+
+ ));
+ };
+ return (
+
+ );
+};
+
+export default Index;
diff --git a/src/pages/exam/components/list.less b/src/pages/profile/components/list/index.less
similarity index 90%
rename from src/pages/exam/components/list.less
rename to src/pages/profile/components/list/index.less
index 8bb5454a3fcf35c0ff5d416065a2a896365a1ea7..da65dbe9fed6e2da3ba9792507ccdc75919628b3 100644
--- a/src/pages/exam/components/list.less
+++ b/src/pages/profile/components/list/index.less
@@ -7,4 +7,5 @@
display: flex;
flex-direction: column;
justify-content: space-between;
+ padding: 16px;
}
\ No newline at end of file
diff --git a/src/pages/profile/components/list/item.js b/src/pages/profile/components/list/item.js
new file mode 100644
index 0000000000000000000000000000000000000000..4de5bf87c8a1fcad03aded5622612f00321c8c39
--- /dev/null
+++ b/src/pages/profile/components/list/item.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import { Button } from 'antd-mobile';
+import Icon from 'components/Icon';
+import styles from './item.less';
+
+const Index = ({ id, image, title, like, share }) => {
+ return (
+
+
+
+
+
+
{title}
+
+
+ 有效期至
+ 2020.05.10
+
+
+ 浏览
+ 14222
+
+
+
+
+ );
+};
+
+export default Index;
diff --git a/src/pages/profile/components/list/item.less b/src/pages/profile/components/list/item.less
new file mode 100644
index 0000000000000000000000000000000000000000..cefd7cb1608ef5ecdf0af84ffbff770345cbb5f7
--- /dev/null
+++ b/src/pages/profile/components/list/item.less
@@ -0,0 +1,55 @@
+@import '~@/themes/vars.less';
+
+.root {
+ :global {
+ .am-button {
+ background-color: #176aff;
+ height: 24px;
+ line-height: 24px;
+ width: 64px;
+ border-radius: 10px;
+ font-size: 12px;
+ }
+ }
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 16px;
+ img {
+ border-radius: 5px;
+ width: 120px;
+ height: 92px;
+ }
+ .right {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ padding: 4px 0 4px 16px;
+ .title {
+ font-size: @space-sm;
+ font-weight: 600;
+ color: @item-title-color;
+ line-height: 1.5;
+ }
+ .action {
+ display: flex;
+ justify-content: space-between;
+ .cnt{
+ margin-left: 12px;
+ }
+ .limitTime {
+ height: 17px;
+ font-size: 12px;
+ font-weight: 500;
+ color: rgba(236, 164, 0, 1);
+ line-height: 17px;
+ }
+ .view {
+ height: 17px;
+ font-size: 12px;
+ font-weight: 500;
+ color: rgba(204, 204, 204, 1);
+ line-height: 17px;
+ }
+ }
+ }
+}
diff --git a/src/pages/profile/course/index.js b/src/pages/profile/course/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..7136463074db6c7f9f2e6a936994e5597f849ecb
--- /dev/null
+++ b/src/pages/profile/course/index.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import List from '../components/list';
+const Index = () => {
+ const dataSource = [
+ {
+ id: 1,
+ image: '/images/exam1.png',
+ title: '2020版中西医结合执业助理医师 模拟试',
+ like: 0,
+ share: 1,
+ },
+ {
+ id: 2,
+ image: '/images/exam1.png',
+ title: '2020版中西医结合执业助理医师 模拟试',
+ like: 0,
+ share: 0,
+ },
+ {
+ id: 3,
+ image: '/images/exam1.png',
+ title: '2020版中西医结合执业助理医师 模拟试',
+ like: 1,
+ share: 1,
+ },
+ ];
+
+ const opt={
+ dataSource,
+ }
+ return (
+ <>
+
+ >
+ );
+};
+export default Index;
diff --git a/src/pages/profile/index.js b/src/pages/profile/index.js
index cef9e00962339909113a3cf7d339eaf21c7c52a8..55ea77028f75bbbf83ec77bd7a0d769123828544 100644
--- a/src/pages/profile/index.js
+++ b/src/pages/profile/index.js
@@ -64,10 +64,9 @@ const Index = () => {
加入会员