diff --git a/src/api/index.js b/src/api/index.js index 2a317e1..e3f1677 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -35,4 +35,6 @@ export default { subjectCategoryCited: `${host}nakadai/nakadai/subject/subjectCategoryCited`, goodsSchemeClassification: `${host}nakadai/mall/goodsSchemeClassification`, schemeList: `${host}nakadai/nakadai/partner/schemeManagement/schemeList`, + curriculumChapter: `${host}nakadai/nakadai/curriculum/chapter/queryChaptersAndSubsections`, + curriculumGetSubsection: `${host}nakadai/nakadai/curriculum/subsection/getSubsection`, } \ No newline at end of file diff --git a/src/assets/images/index/customer.png b/src/assets/images/index/customer.png new file mode 100644 index 0000000..dfd21c5 Binary files /dev/null and b/src/assets/images/index/customer.png differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index a31d7b3..db6015d 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/components/rightColumns/index.vue b/src/components/rightColumns/index.vue index 47f20fd..53ce483 100644 --- a/src/components/rightColumns/index.vue +++ b/src/components/rightColumns/index.vue @@ -64,7 +64,7 @@ export default { isSort: 1 }).then(({ data }) => { this.columns = data - this.$parent.getInfo && this.$parent.getInfo() + this.$parent.getInfo && this.$route.query.id && this.$parent.getInfo() }).catch(err => { }) this.$post(`${this.api.hotContent}?siteId=${this.site}`).then(({ data }) => { diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue index d0af7ee..d5c9792 100644 --- a/src/layouts/footer/index.vue +++ b/src/layouts/footer/index.vue @@ -169,7 +169,7 @@ export default { // 获取iasf中文首页应用模块数据 getInfo () { // 预览/详情 - this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.$route.query.id}`).then(({ data }) => { + this.$route.query.id && this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.$route.query.id}`).then(({ data }) => { if (data.length) { // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing const json = JSON.parse(this.preview ? diff --git a/src/mixins/estate/index.js b/src/mixins/estate/index.js index 250afec..ae4b2c9 100644 --- a/src/mixins/estate/index.js +++ b/src/mixins/estate/index.js @@ -12,7 +12,7 @@ export default { // 获取文章详情 getInfo() { // 预览/详情 - this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => { + this.id && this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => { if (data.length) { // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing const json = JSON.parse(this.preview ? diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js index 388eed5..5af307a 100644 --- a/src/mixins/page/index.js +++ b/src/mixins/page/index.js @@ -15,7 +15,7 @@ export default { } }, mounted() { - this.getInfo && this.id && this.getInfo() + this.getInfo && this.$route.query.id && this.getInfo() }, methods: { // 打开链接 diff --git a/src/pages/aboutUs/index.vue b/src/pages/aboutUs/index.vue index 06be872..b54e452 100644 --- a/src/pages/aboutUs/index.vue +++ b/src/pages/aboutUs/index.vue @@ -454,7 +454,7 @@

微信扫码添加职站售前咨询

提供付费咨询及解决方案

@@ -469,8 +469,8 @@

售前咨询

刘老师

-

18019930142

+ style="margin-bottom: 5px">郭老师

+

17671782660

@@ -1363,14 +1363,76 @@ export default { left: 100px; } } -@media (max-width: 1470px) { - .wrap .banner { - .text2, - .text3 { - width: 500px; +@media (max-width: 1200px) { + .wrap { + .banner { + .text { + left: 30px; + } } - .text { - left: 50px; + .inner { + width: 90%; + } + .pics { + flex-direction: column; + .text { + width: 100%; + margin-bottom: 20px; + } + img { + display: none; + } + } + .service-intro { + margin-top: 0; + } + .service { + .service-pic { + flex-direction: column; + .text { + margin: 0 0 30px 0; + } + } + } + .culture, + .adv, + .service, + .product { + .list { + flex-direction: column; + li { + width: 100%; + margin: 0 0 20px 0; + } + } + } + .adv { + .list { + li { + padding-top: 30px; + } + } + } + .client-pic { + flex-direction: column; + .bg { + width: auto; + height: auto; + max-width: 100%; + margin-right: 0; + } + } + .contact { + .info { + margin-left: 0; + .texts { + flex-direction: column; + align-items: flex-start; + } + .item { + margin: 0 0 30px 0; + } + } } } } diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index 39bca68..4956179 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -13,9 +13,18 @@ :src="item.pic" alt="" @click="openLink(item)"> -
-
{{ item.title }}
-

{{ item.des }}

+
+
+ +

扫小程序下单

+
+
+
{{ item.title }}
+

{{ item.des }}

+
@@ -42,12 +51,14 @@
-
- - +
+
+ + +
  • { + this.id && this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => { if (data.length) { // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing const json = JSON.parse(this.preview ? @@ -568,10 +579,12 @@ export default { /deep/.el-carousel__container { height: 100%; } - .texts { + .text-wrap { position: absolute; - top: 50%; - left: 188px; + top: 55%; + left: 12%; + display: flex; + align-items: center; color: #fff; transform: translateY(-50%); } @@ -582,6 +595,23 @@ export default { .sub { font-size: 24px; } + .qrcode-wrap { + display: inline-block; + padding: 5px; + margin-right: 50px; + text-align: center; + background-color: #fff; + border-radius: 12px; + .text { + margin-top: 5px; + font-size: 12px; + color: #979797; + } + } + .qrcode { + width: 120px; + height: 120px; + } } .intro { @@ -641,14 +671,21 @@ export default { .left { display: inline-flex; } + .tab-wrap { + display: inline-flex; + align-items: center; + } .tab { display: inline-flex; li { position: relative; margin: 0 20px; font-size: 18px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 600; line-height: 25px; color: #0b1d30; + white-space: nowrap; cursor: pointer; &:after { content: ''; @@ -699,6 +736,7 @@ export default { margin-right: 30px; color: #666; font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; font-weight: 600; white-space: nowrap; } @@ -706,6 +744,7 @@ export default { padding: 5px 15px; color: #333; font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; white-space: nowrap; cursor: pointer; &.active { @@ -837,6 +876,7 @@ export default { min-height: 34px; color: #757f92; font-size: 12px; + font-family: PingFangSC-Regular, PingFang SC; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; @@ -849,6 +889,7 @@ export default { } .tag { margin-right: 8px; + font-family: PingFangSC-Regular, PingFang SC; color: #1583ff; background-color: #f9f9f9; border: 0; @@ -874,6 +915,7 @@ export default { display: inline-flex; align-items: center; color: #b5bfd5; + font-family: PingFangSC-Regular, PingFang SC; font-size: 12px; .icon { width: 14px; @@ -891,14 +933,65 @@ export default { } } } -@media (max-width: 1500px) { +@media (max-width: 1200px) { .wrap { - .banner-item { - h6 { - font-size: 35px; + .carousel { + .texts { + left: 50px; } - .sub { - font-size: 18px; + } + .inner { + width: 90%; + } + .type-wrap { + flex-direction: column; + } + .search { + margin-top: 20px; + } + .filter { + .vals { + width: calc(100% - 100px); + } + } + } +} +@media (max-width: 1000px) { + .wrap { + .intro { + flex-direction: column; + justify-content: center; + align-items: flex-start; + li { + flex: 1; + margin-bottom: 20px; + } + } + .type-wrap { + .tab-wrap { + flex-direction: column; + align-items: flex-start; + } + .tab { + margin-top: 10px; + } + } + .courses { + li { + width: calc((100% - 22px) / 2); + &:nth-child(2n) { + margin-right: 0; + } + } + } + } +} +@media (max-width: 640px) { + .wrap { + .courses { + li { + width: 100%; + margin-right: 0; } } } diff --git a/src/pages/index/show/index.vue b/src/pages/index/show/index.vue index 34e2b0a..7716ea5 100644 --- a/src/pages/index/show/index.vue +++ b/src/pages/index/show/index.vue @@ -316,6 +316,7 @@ export default { }, // 跳转播放资源 toPreview (i, j) { + this.qrcodeVisible = true // this.form.goodsRes.logoOfOurSchool ? // this.$router.push(`/station/preview?courseId=${this.form.mall.associatedProduct}&curriculumName=${this.form.mall.productName}&mallId=${this.id}&chapter=${i}§ion=${j}&admin=1`) : // this.toTrail() diff --git a/src/pages/member/index.vue b/src/pages/member/index.vue index 2e401ba..014fadf 100644 --- a/src/pages/member/index.vue +++ b/src/pages/member/index.vue @@ -102,7 +102,7 @@ export default { } h6 { position: relative; - margin: 60px 0 30px; + margin: 60px 0 55px; font-size: 2rem; font-weight: 600; text-align: center; @@ -126,15 +126,15 @@ export default { .step { display: flex; justify-content: space-between; - padding: 0 60px 0 100px; + padding: 0 160px 0 200px; li { position: relative; - font-size: 1.2rem; + font-size: 1.1rem; color: #a3a3a3; &:before { content: ''; position: absolute; - top: 2px; + top: -2px; left: -34px; width: 24px; height: 24px; @@ -187,4 +187,47 @@ export default { } } } +@media (max-width: 1200px) { + .reg { + .equity-wrap { + width: 90%; + .equity { + padding: 0 20px; + } + } + .step { + flex-wrap: wrap; + padding: 0 30px 0 50px; + li { + width: 50%; + &:first-child, + &:nth-child(2) { + margin-bottom: 20px; + } + } + } + .param { + padding: 0; + li { + width: 50%; + } + } + } +} +@media (max-width: 640px) { + .reg { + .step { + li { + width: 100%; + margin-bottom: 20px; + &:last-child { + margin-bottom: 0; + } + } + } + .btn { + width: 100%; + } + } +} \ No newline at end of file diff --git a/src/pages/publish/index.vue b/src/pages/publish/index.vue index 2e9c027..93bb8b6 100644 --- a/src/pages/publish/index.vue +++ b/src/pages/publish/index.vue @@ -1,7 +1,11 @@ @@ -82,7 +107,7 @@ export default { name: 'cityPartner', data () { return { - + qrcodeVisible: false, } }, mounted () { }, @@ -132,6 +157,20 @@ export default { padding: 67px 0; margin: 0 auto; } + .entry { + margin-top: 30px; + text-align: center; + .apply { + margin-top: 20px; + } + // /deep/.el-step__head.is-finish { + // color: #f00; + // border-color: #f00; + // } + // /deep/.el-step__title.is-finish { + // color: #f00; + // } + } .about { position: relative; margin: -60px 0 20px; @@ -220,9 +259,13 @@ export default { background: url(../../assets/images/dev/profit-bg1.png) 0 0/100% 100% no-repeat; } .item2 { + display: flex; + justify-content: center; + align-items: center; width: 70%; + height: 202px; + padding: 0 30px; margin: -100px auto 0; - line-height: 202px; font-size: 30px; color: #0b1d30; background: url(../../assets/images/dev/profit-bg2.png) 0 0/100% 100% no-repeat; @@ -240,4 +283,42 @@ export default { } } } +@media (max-width: 1200px) { + .wrap { + .banner { + padding: 50px 0 0 50px; + .dev { + bottom: 80px; + } + } + .inner { + width: 90%; + } + } +} +@media (max-width: 1000px) { + .wrap { + .sup { + .list { + flex-direction: column; + li { + width: 100%; + padding: 140px 80px 50px; + } + } + } + .con { + .list { + flex-direction: column; + li { + margin-bottom: 20px; + } + } + } + .profit { + .item2 { + } + } + } +} \ No newline at end of file