From 1c83eb570af8c436e008656099862e2907471d5a Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Thu, 6 Jun 2024 18:41:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=A0=8F=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 70 +++++++++-------- src/pages/aboutUs/index.vue | 151 +++++++++--------------------------- src/setting.js | 8 +- 3 files changed, 78 insertions(+), 151 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index b04bb63..668a2a1 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -2,39 +2,41 @@ import Setting from '@/setting' const host = Setting.huoranApi export default { - newlyPublishedArticles: `iasf/sysContent/newlyPublishedArticles`, - listWithTree: `iasf/sysColumn/listWithTree`, - findArticle: `iasf/sysContent/findById`, - findPage: `iasf/sysColumnLongPage/getLongPageInformation`, - queryArticle: `iasf/sysContent/pagingQuery`, - getRedisCache: `iasf/sysColumnLongPage/getRedisCache`, - listWithTreeMenuVisible: `iasf/sysColumn/listWithTreeMenuVisible`, - theAttachmentUnderTheQueryColumn: `iasf/content/file/theAttachmentUnderTheQueryColumn`, - findColumn: `iasf/sysColumn/findById`, - queryClassif: `iasf/content/classification/allTheQuery`, - getTheFullArticleByColumn: `iasf/sysColumn/getTheFullArticleByColumn`, - queryLabel: `iasf/content/label/queryAllArticleSubjectTags`, - getsTheSubColumn: `iasf/sysColumn/getsTheSubColumn`, - articlePreview: `iasf/sysContent/articlePreview`, - getsSublevelColumnsUnderALevel: `iasf/sysColumn/getsSublevelColumnsUnderALevel`, - hotContent: `iasf/sysContent/hotContent`, - siteSearchArticles: `iasf/sysContent/siteSearchArticles`, - oneLevelChecksThemAll: `iasf/sysColumn/oneLevelChecksThemAll`, - queryArticlesByColumnType: `iasf/sysColumn/queryArticlesByColumnType`, - seoList: `iasf/seo/list`, + newlyPublishedArticles: `/iasf/sysContent/newlyPublishedArticles`, + listWithTree: `/iasf/sysColumn/listWithTree`, + findArticle: `/iasf/sysContent/findById`, + findPage: `/iasf/sysColumnLongPage/getLongPageInformation`, + queryArticle: `/iasf/sysContent/pagingQuery`, + getRedisCache: `/iasf/sysColumnLongPage/getRedisCache`, + listWithTreeMenuVisible: `/iasf/sysColumn/listWithTreeMenuVisible`, + theAttachmentUnderTheQueryColumn: `/iasf/content/file/theAttachmentUnderTheQueryColumn`, + findColumn: `/iasf/sysColumn/findById`, + queryClassif: `/iasf/content/classification/allTheQuery`, + getTheFullArticleByColumn: `/iasf/sysColumn/getTheFullArticleByColumn`, + queryLabel: `/iasf/content/label/queryAllArticleSubjectTags`, + getsTheSubColumn: `/iasf/sysColumn/getsTheSubColumn`, + articlePreview: `/iasf/sysContent/articlePreview`, + getsSublevelColumnsUnderALevel: `/iasf/sysColumn/getsSublevelColumnsUnderALevel`, + hotContent: `/iasf/sysContent/hotContent`, + siteSearchArticles: `/iasf/sysContent/siteSearchArticles`, + oneLevelChecksThemAll: `/iasf/sysColumn/oneLevelChecksThemAll`, + queryArticlesByColumnType: `/iasf/sysColumn/queryArticlesByColumnType`, + seoList: `/iasf/seo/list`, + listFloating: `/iasf/SysFloatingColumnSchemeService/SysFloatingColumnScheme/floatingBarList`, + findFloating: `/iasf/SysFloatingColumnSchemeService/SysFloatingColumnScheme/findById`, - listMarketing: `nakadai/nakadai/mall/marketing/promotion/pagingQueryList`, - // 产品中心 - productCategoryList: `${host}nakadai/productClassification/productCategoryList`, - productTypeList: `${host}nakadai/productType/productTypeList`, - supplierList: `${host}nakadai/supplier/supplierList`, - tagsList: `${host}nakadai/tags/tagsList`, - websiteProductList: `${host}nakadai/mall/websiteProductList`, - detailsOfGoods: `${host}nakadai/mall/detailsOfGoods`, - addLearningRecord: `${host}nakadai/mallCourseLearningRecord/addLearningRecord`, - 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`, + listMarketing: `/nakadai/nakadai/mall/marketing/promotion/pagingQueryList`, + // 产品中心 + productCategoryList: `${host}/nakadai/productClassification/productCategoryList`, + productTypeList: `${host}/nakadai/productType/productTypeList`, + supplierList: `${host}/nakadai/supplier/supplierList`, + tagsList: `${host}/nakadai/tags/tagsList`, + websiteProductList: `${host}/nakadai/mall/websiteProductList`, + detailsOfGoods: `${host}/nakadai/mall/detailsOfGoods`, + addLearningRecord: `${host}/nakadai/mallCourseLearningRecord/addLearningRecord`, + 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/pages/aboutUs/index.vue b/src/pages/aboutUs/index.vue index c8592a4..ccd235b 100644 --- a/src/pages/aboutUs/index.vue +++ b/src/pages/aboutUs/index.vue @@ -187,37 +187,17 @@
-
-
-

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

-

提供付费咨询及解决方案

- -
-
-
-
-
-
- -
-
-

售前咨询

-

金老师

-

15218726836

-
-
-
-
- -
-
-

咨询，建议与反馈

-

您的每一条建议声音，我们都认真对待

-
+ + +
@@ -235,15 +215,33 @@ export default { active: '', clients: [1, 2, 3, 4, 5], sr: null, + floatings: [], } }, components: { scroll }, mounted () { - + this.getFloating() }, methods: { + // 查询悬浮栏 + async getFloating () { + const { data } = await this.$post(this.api.listFloating, { + siteId: this.site, + search: '', + pageNum: 1, + pageSize: 10, + isForeground: 1, + }) + data.records.map(async e => { + const { data } = await this.$post(`${this.api.findFloating}?id=${e.floatingBarSchemeId}`) + this.$set(e, 'modules', data.floatingColumnSchemeModules) + // e.modules = data.floatingColumnSchemeModules + }) + this.floatings = data.records + console.log("🚀 ~ getFloating ~ this.floatings:", this.floatings) + }, // 初始化动画 initAnimate () { const sr = ScrollReveal() @@ -1245,31 +1243,12 @@ export default { margin-bottom: 10px; border: 1px solid #e5e5e5; cursor: pointer; - } - - .wechat { - background: #fff url(https://huorantech.com/images/index/wechat.png) center center/auto no-repeat; - - &:hover { - background-image: url(https://huorantech.com/images/index/wechat-1.png); - background-color: #006eff; - - &+.popup { - display: block; - } - } - } - - .tel { - background: #fff url(https://huorantech.com/images/index/tel.png) center center/auto no-repeat; + background-color: #fff; + background-position: center center; + background-repeat: no-repeat; &:hover { - background-image: url(https://huorantech.com/images/index/tel-1.png); - background-color: #006eff; - - &+.popup { - display: block; - } + border-color: #1692ff; } } @@ -1285,74 +1264,20 @@ export default { .popup { position: absolute; display: none; - } - - .wechat-popup { top: -100px; - left: -230px; + right: 45px; padding: 20px; - text-align: center; background-color: #fff; - box-shadow: 0px 0px 7px 0px rgba(203, 203, 203, 0.55); - - .tips { - font-size: 14px; - } - - .des { - margin: 5px 0 15px; - font-size: 12px; - color: #333; - } + background-clip: padding-box; + border-right: 25px solid transparent; } - .tel-popup { - top: -10px; - left: -250px; - width: 250px; - border-right: 20px solid transparent; + .float { + position: relative; - &:hover { + &:hover .popup { display: block; } - - .tel-inner { - padding: 20px; - background-color: #fff; - box-shadow: 0px 0px 7px 0px rgba(203, 203, 203, 0.55); - } - - .line { - display: flex; - - &:first-child { - margin-bottom: 20px; - } - } - - .text { - margin-left: 15px; - } - - .title { - margin-bottom: 5px; - font-size: 14px; - cursor: pointer; - - &:hover { - color: #006eff; - } - } - - .tel-num { - font-size: 12px; - color: #006eff; - } - - .des { - font-size: 12px; - color: #686868; - } } } diff --git a/src/setting.js b/src/setting.js index b260d0b..85cd99f 100644 --- a/src/setting.js +++ b/src/setting.js @@ -6,8 +6,8 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境 const isGta = url.includes('139.159.254.212'); // 国泰安 let host = `${location.origin}/` if (isDev) { - // host = 'http://192.168.31.52:10000/' - host = 'https://huorantech.com/' + host = 'http://192.168.31.217:10000/' + // host = 'https://huorantech.com' // host = 'http://139.159.254.212/' } @@ -18,12 +18,12 @@ const Setting = { titleSuffix: '深圳或然科技官网', // 网页标题的后缀 routerMode: "hash", // 路由模式，可选值为 history 或 hash apiBaseURL: host, // 接口请求地址 - huoranApi: `https://www.occupationlab.com/`, + huoranApi: `https://www.occupationlab.com`, autoLogoutTime: 3600000, // 长时间未操作，自动退出登录时间 modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒 errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice isDev, - isGta, + isGta, /** * 路由白名单 * */