Skip to content

M
mr-julyedu
Commit 3e358f28 by caixinyu
Options

添加python活动页面

parent 2cbf5e70
Showing with 256 additions and 23 deletions
package-lock.json
...@@ -19569,20 +19569,25 @@ ...@@ -19569,20 +19569,25 @@
"@babel/highlight": "^7.8.3" "@babel/highlight": "^7.8.3"
} }
}, },
"@babel/helper-validator-identifier": {
"version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
"integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
},
"@babel/highlight": { "@babel/highlight": {
"version": "7.10.4", "version": "7.18.6",
"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
"integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
"requires": { "requires": {
"@babel/helper-validator-identifier": "^7.10.4", "@babel/helper-validator-identifier": "^7.18.6",
"chalk": "^2.0.0", "chalk": "^2.0.0",
"js-tokens": "^4.0.0" "js-tokens": "^4.0.0"
} }
}, },
"ansi-regex": { "ansi-regex": {
"version": "5.0.0", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
}, },
"browserslist": { "browserslist": {
"version": "4.10.0", "version": "4.10.0",
...@@ -19595,11 +19600,6 @@ ...@@ -19595,11 +19600,6 @@
"pkg-up": "^3.1.0" "pkg-up": "^3.1.0"
} }
}, },
"caniuse-lite": {
"version": "1.0.30001109",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz",
"integrity": "sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ=="
},
"cli-width": { "cli-width": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
...@@ -19665,9 +19665,9 @@ ...@@ -19665,9 +19665,9 @@
}, },
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "4.1.0", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
}, },
"strip-ansi": { "strip-ansi": {
"version": "5.2.0", "version": "5.2.0",
...@@ -19729,13 +19729,23 @@ ...@@ -19729,13 +19729,23 @@
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
}, },
"string-width": { "string-width": {
"version": "4.2.0", "version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"requires": { "requires": {
"emoji-regex": "^8.0.0", "emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0", "is-fullwidth-code-point": "^3.0.0",
"strip-ansi": "^6.0.0" "strip-ansi": "^6.0.1"
},
"dependencies": {
"strip-ansi": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"requires": {
"ansi-regex": "^5.0.1"
}
}
} }
}, },
"strip-ansi": { "strip-ansi": {
......
package.json
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
"react-ace": "^8.1.0", "react-ace": "^8.1.0",
"react-app-polyfill": "^1.0.6", "react-app-polyfill": "^1.0.6",
"react-copy-to-clipboard": "^5.0.2", "react-copy-to-clipboard": "^5.0.2",
"react-dev-utils": "^10.2.1", "react-dev-utils": "10.2.1",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"react-infinite-scroller": "^1.2.4", "react-infinite-scroller": "^1.2.4",
"react-lazy-load": "^3.1.13", "react-lazy-load": "^3.1.13",
......
src/components/detail/group/togroup.js
...@@ -306,7 +306,7 @@ function GorupContent(props) { ...@@ -306,7 +306,7 @@ function GorupContent(props) {
}) })
if (flag) { if (flag) {
tip = ( tip = (
<p className="tip">{`拼团省￥${round( <p className="tip">{`拼团省￥${Math.round(
data.price1 - pdd_price, data.price1 - pdd_price,
2 2
)}元`}</p> )}元`}</p>
...@@ -320,7 +320,7 @@ function GorupContent(props) { ...@@ -320,7 +320,7 @@ function GorupContent(props) {
} else { } else {
if (getParam("is_originator") == 1) { if (getParam("is_originator") == 1) {
tip = ( tip = (
<p className="tip">{`拼团省￥${round( <p className="tip">{`拼团省￥${Math.round(
data.price1 - pdd_price, data.price1 - pdd_price,
2 2
)}元`}</p> )}元`}</p>
...@@ -336,7 +336,7 @@ function GorupContent(props) { ...@@ -336,7 +336,7 @@ function GorupContent(props) {
) )
} else { } else {
tip = ( tip = (
<p className="tip">{`拼团省￥${round( <p className="tip">{`拼团省￥${Math.round(
data.price1 - pdd_price, data.price1 - pdd_price,
2 2
)}元`}</p> )}元`}</p>
......
src/components/pythonCourse/index.scss 0 → 100755
@import "src/assets/css/variable";
*,
body {
padding: 0;
margin: 0;
font-family: PingFangSC-Regular;
}
body{
pointer-events: initial!important;
}
.python-model {
position: fixed;
top: 0;
left: 0;
bottom: 0;
right: 0;
background: rgba(0, 0, 0, 0.6);
}
.python-course-model-box {
width: 100%;
height: 100%;
top: calc(50% - 180px);
position: relative;
}
.python-course-model-box img.quan {
display: block;
width: 375px;
margin: 0 auto;
}
.CloseCircle{
display: block;
margin:0 auto;
width:40px;
height:40px;
}
.course-prise{
position: absolute;
top: 195px;
left: 80px;
width: 170px;
height: 74px;
}
.course-prise-first-child{
font-weight: bold;
line-height: 40px;
text-align: center;
font-size: 26px;
color: #f00;
}
.course-prise-last-child{
color: #fff;
text-align: center;
line-height: 28px;
}
div {
box-sizing: border-box;
}
.content {
background-color: #3fa9ff;
padding-bottom: 30px;
}
.banner {
width: 100%;
}
.banner img {
display: block;
width: 100%;
height: auto;
}
.course-list {
padding: 0 12px;
}
.course-list-title {
font-size: 20px;
color: #fff;
font-weight: 700;
text-align: center;
margin-bottom: 38px;
}
.course-list-item {
min-height: 73px;
background-color: #fff;
border-radius: 8px;
margin-bottom: 32px;
position: relative;
padding: 28px 4px 16px 20px;
}
.course-list-item-tig {
position: absolute;
top: -12px;
left: 20px;
font-size: 11px;
min-width: 142px;
padding: 0 4px;
height: 24px;
line-height: 24px;
background-image: linear-gradient(180deg, #ffbf69 0%, #fa8d15 100%);
border-radius: 4px;
text-align: center;
color: #fff;
font-weight: 500;
}
.course-list-item-img {
display: block;
width: 142px;
height: 102px;
margin-right: 15px;
border-radius: 4px;
}
.course-list-item-title {
font-family: SourceHanSansCN-Bold;
font-size: 18px;
color: #333333;
letter-spacing: 0.03px;
line-height: 18px;
font-weight: 700;
padding-top: 6px;
}
.course-list-item-des {
width: 154px;
font-family: SourceHanSansCN-Normal;
font-size: 12px;
color: #666666;
letter-spacing: 0.02px;
line-height: 12px;
font-weight: 400;
padding-top: 12px;
padding-bottom: 16px;
}
.course-list-item-btn {
display: block;
width: 102px;
height: 32px;
background-image: linear-gradient(179deg, #ff7874 0%, #f5212d 100%);
border-radius: 4px;
text-align: center;
line-height: 32px;
font-size: 16px;
color: #fff;
text-decoration: none;
font-weight: 700;
}
.course-des {
margin-top: 32px;
width: 351px;
margin: 0 auto;
background: #fff;
border-radius: 8px;
padding-right: 20px;
padding-bottom: 16px;
}
.course-des-tilte {
width: 351px;
height: 40px;
line-height: 40px;
text-align: center;
background: #ffe7ba;
border-radius: 8px 8px 0 0;
font-family: SourceHanSansCN-Bold;
font-size: 20px;
color: #2297fe;
letter-spacing: 0.03px;
font-weight: 700;
}
.course-des-container {
padding-left: 52px;
padding-top: 20px;
}
.course-des-content-row {
margin-bottom: 12px;
position: relative;
}
.course-des-content-row:last-child{
margin-bottom:0;
}
.course-des-icon {
display: block;
position: absolute;
left: -32px;
top: 10px;
width: 24px;
height: 24px;
line-height: 24px;
background: #009aff;
border-radius: 50%;
color: #fff;
text-align: center;
font-weight: 700;
}
.course-des-text {
font-size: 14px;
color: #333333;
letter-spacing: 0.02px;
text-align: justify;
line-height: 22px;
}
.flex-row {
display: flex;
}
src/router/router-config.js
...@@ -531,4 +531,10 @@ export default [ ...@@ -531,4 +531,10 @@ export default [
import(/* webpackChunkName: 'ts-test' */ "src/components/ts-test") import(/* webpackChunkName: 'ts-test' */ "src/components/ts-test")
), ),
}, },
{
path: "/python-course",
component: loadable(() =>
import("src/components/pythonCourse")
),
},
] ]
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