diff --git a/public/static/img/about/aboutBanner.png b/public/static/img/about/aboutBanner.png index 2560fd8..4aa9374 100644 Binary files a/public/static/img/about/aboutBanner.png and b/public/static/img/about/aboutBanner.png differ diff --git a/public/static/img/contactUs/address.png b/public/static/img/contactUs/address.png index 8ea9aba..e9067df 100644 Binary files a/public/static/img/contactUs/address.png and b/public/static/img/contactUs/address.png differ diff --git a/public/static/img/contactUs/email.png b/public/static/img/contactUs/email.png index 5fb4c88..114bc91 100644 Binary files a/public/static/img/contactUs/email.png and b/public/static/img/contactUs/email.png differ diff --git a/public/static/img/contactUs/phone.png b/public/static/img/contactUs/phone.png deleted file mode 100644 index 6613387..0000000 Binary files a/public/static/img/contactUs/phone.png and /dev/null differ diff --git a/public/static/img/contactUs/postcode.png b/public/static/img/contactUs/postcode.png deleted file mode 100644 index d68824a..0000000 Binary files a/public/static/img/contactUs/postcode.png and /dev/null differ diff --git a/public/static/img/contactUs/publicAccount.png b/public/static/img/contactUs/publicAccount.png index 877a82a..1b5cc83 100644 Binary files a/public/static/img/contactUs/publicAccount.png and b/public/static/img/contactUs/publicAccount.png differ diff --git a/public/static/img/contactUs/serviceTime.png b/public/static/img/contactUs/serviceTime.png deleted file mode 100644 index b12582e..0000000 Binary files a/public/static/img/contactUs/serviceTime.png and /dev/null differ diff --git a/public/static/img/contactUs/website.png b/public/static/img/contactUs/website.png index 402f4cd..1cd7fb9 100644 Binary files a/public/static/img/contactUs/website.png and b/public/static/img/contactUs/website.png differ diff --git a/src/assets/css/common.css b/src/assets/css/common.css index 64bf3fd..cb9e3e1 100644 --- a/src/assets/css/common.css +++ b/src/assets/css/common.css @@ -67,10 +67,6 @@ a:focus { outline: none; } -.wrapper1130 { - width: 1130rem; - margin: 0 auto; -} .wrapper1400 { width: 1400rem; margin: 0 auto; diff --git a/src/views/About/ContactUs/Index.vue b/src/views/About/ContactUs/Index.vue index f60f572..9000c32 100644 --- a/src/views/About/ContactUs/Index.vue +++ b/src/views/About/ContactUs/Index.vue @@ -1,36 +1,108 @@ @@ -45,26 +117,26 @@ export default { }, data () { return { + screen1: { + bannerUrl: '', + }, screen2: { - offsets: [300], - offsetLevel: -1, - title: '', - contentCn: ``, + title: '服务热线', + lineNumber: '400-001-6725', + lineTime: '服务时间：周一至周五AM 09:00-12:00 PM 01:00-06:00', }, contacts: [ - { - title: '联系我们', - children: [ - { title: '服务热线：', value: '+86.400-001-6725', src: '/static/img/contactUs/phone.png' }, - { title: '公司网址：', value: 'www.Fshg.cc', src: '/static/img/contactUs/website.png' }, - { title: '公司邮箱：', value: 'Info@Fshg.cc', src: '/static/img/contactUs/email.png' }, - { title: '公众号：', value: 'FutureStarHolding', src: '/static/img/contactUs/publicAccount.png' }, - { title: '服务时间：', value: '周一至周五AM 09:00-12:00 PM 01:00-06:00', src: '/static/img/contactUs/serviceTime.png' }, - { title: '公司地址：', value: '海南省三亚市天涯区育春路七巷九号', src: '/static/img/contactUs/address.png' }, - { title: '邮编：', value: '572022', src: '/static/img/contactUs/postcode.png' }, - ], - }, + { title: '公司网址', value: 'www.Fshg.cc', src: '/static/img/contactUs/website.png' }, + { title: '公司邮箱', value: 'Info@Fshg.cc', src: '/static/img/contactUs/email.png' }, + { title: '公众号', value: 'FutureStarHolding', src: '/static/img/contactUs/publicAccount.png' }, + { title: '公司地址', value: '海南省三亚市天涯区育春路七巷九号', src: '/static/img/contactUs/address.png' }, ], + form: { + title: '', + feedbackPerson: '', + contactWay: '', + feedbackContent: '', + }, }; }, computed: { @@ -73,30 +145,21 @@ export default { webScale: state => state.web.scale, }), }, - watch: { - scrollTop (val) { - const v = val / this.webScale; - if (v < 50) { - this.$event.$emit('nav-theme', 'light', { - bgColor: '#ffffff00', - shadow: false, - }); - } else { - this.$event.$emit('nav-theme', 'light'); - } - const i2 = this.screen2.offsetLevel + 1; - if (v >= this.screen2.offsets[i2]) { - this.screen2.offsetLevel = i2; - } + created () { + this.$event.$emit('nav-theme', 'light'); + this.getScreen1Banner(); + }, + methods: { + async getScreen1Banner () { + try { + const res = await this.$request.get( + '/official/index/list', + { params: { pageNum: 1, pageSize: 1, captionName: '联系我们/banner' } }, + ); + this.screen1.bannerUrl = res.rows[0].imageurl; + } catch (error) {} }, }, - created () { - this.$event.$emit('nav-theme', 'light', { - bgColor: '#ffffff00', - shadow: false, - }); - }, - methods: { }, }; @@ -106,28 +169,140 @@ export default { } .screen2 { - padding: 200rem 0; + padding: 80rem 0; + height: 580rem; box-sizing: border-box; background: #FFFFFF; } -.screen2 .title { - font-family: MicrosoftYaHei; +.screen2 .lineTtile { + width: 100%; + text-align: center; + font-family: MicrosoftYaHeiSemibold; font-weight: 400; - font-size: 36rem; - color: #000000; - margin-bottom: 70rem; - white-space: pre-line; - line-height: 72rem; + font-size: 28rem; + color: #111111; + line-height: 64rem; } -.screen2 .list-wrapper .content-cn { - width: 1160rem; +.screen2 .lineTime { + width: 100%; + text-align: center; font-family: MicrosoftYaHeiLight; - font-weight: 300; + font-size: 20rem; + color: #8B8A8A; + line-height: 20rem; + margin-bottom: 55rem; +} +.screen2 .lineNumber { + width: 100%; + text-align: center; + font-family: Impact; + font-size: 44rem; + color: #111111; + line-height: 44rem; + font-style: normal; + text-transform: none; + letter-spacing:2.8rem; +} +.screen2 .wrapper1680 { + height: 100%; + position: relative; +} +.screen2 .list-wrapper { + position: absolute; + top: 280rem; + width: 100%; + display: flex; + flex-wrap: wrap; + padding: 0rem; + box-sizing: border-box; +} +.screen2 .list-item { + width: 375rem; + height: 120rem; + border: 1rem solid #C7C7C7; + background: #ffffff; + margin: 0 20rem; + display: flex; + flex-direction: column; + justify-content: center; +} +.screen2 .imgCol { + padding: 30rem 30rem 30rem 60rem; +} +.screen2 .list-img { + width: 50rem; + height: 50rem; +} +.screen2 .listContent { + padding-right: 50rem; +} +.screen2 .list-title { + margin-top: 18rem; + font-family: MicrosoftYaHeiSemibold; font-size: 18rem; color: #000000; - line-height: 36rem; - letter-spacing:2.8rem; - text-align: justify; - white-space: pre-wrap; + line-height: 40rem; + text-align: left; + font-style: normal; + text-transform: none; +} +.screen2 .list-value { + font-family: MicrosoftYaHei; + font-size: 18rem; + color: #545454; + line-height: 22rem; + text-align: left; + font-style: normal; + text-transform: none; +} +.screen3 { + padding: 80rem 120rem; + background: #F5F5F7; +} +.screen3 .wrapper1680 { + height: 478rem; + background: #FFFFFF; + border-radius: 10rem 10rem 10rem 10rem; +} +.fkContent { + padding: 20rem 30rem; +} +.fkBar { + display: inline-block; + width: 4rem; + height: 20rem; + background: #014DB5; +} +.fkTitle { + display: inline-block; + padding-left: 10rem; + font-family: MicrosoftYaHeiSemibold; + font-size: 24rem; + color: #014DB5; + line-height: 64rem; + text-align: justifyLeft; + font-style: normal; + text-transform: none; +} +.fkRemark { + font-family: MicrosoftYaHei; + font-size: 18rem; + color: #BBBBBB; + line-height: 18rem; + text-align: left; + font-style: normal; + text-transform: none; +} +.subBtn { + width: 140rem; + height: 50rem; + background: #014DB5; + border-radius: 4rem; + font-family: MicrosoftYaHei; + font-size: 18rem; + color: #FFFFFF; + text-align: center; + font-style: normal; + text-transform: none; } diff --git a/src/views/Business/Commercial/Index.vue b/src/views/Business/Commercial/Index.vue index 1bcb660..35d4b39 100644 --- a/src/views/Business/Commercial/Index.vue +++ b/src/views/Business/Commercial/Index.vue @@ -162,7 +162,6 @@
diff --git a/src/views/Business/Construction/Index.vue b/src/views/Business/Construction/Index.vue index cc7d043..38dd068 100644 --- a/src/views/Business/Construction/Index.vue +++ b/src/views/Business/Construction/Index.vue @@ -162,7 +162,6 @@
diff --git a/src/views/Business/FutureAgriculture/Index.vue b/src/views/Business/FutureAgriculture/Index.vue index 089d0a2..b01373b 100644 --- a/src/views/Business/FutureAgriculture/Index.vue +++ b/src/views/Business/FutureAgriculture/Index.vue @@ -162,7 +162,6 @@
diff --git a/src/views/Business/GlobalSupplyChain/Index.vue b/src/views/Business/GlobalSupplyChain/Index.vue index 9e202a7..337fac1 100644 --- a/src/views/Business/GlobalSupplyChain/Index.vue +++ b/src/views/Business/GlobalSupplyChain/Index.vue @@ -213,7 +213,6 @@
diff --git a/src/views/Business/HealthIndustry/Index.vue b/src/views/Business/HealthIndustry/Index.vue index af609c4..059dc50 100644 --- a/src/views/Business/HealthIndustry/Index.vue +++ b/src/views/Business/HealthIndustry/Index.vue @@ -162,7 +162,6 @@
diff --git a/src/views/CompanyInformation/Index.vue b/src/views/CompanyInformation/Index.vue index 555ed1e..c5fe065 100644 --- a/src/views/CompanyInformation/Index.vue +++ b/src/views/CompanyInformation/Index.vue @@ -94,31 +94,31 @@ export default { }, computed: { ...mapState({ - scrollTop: state => state.scroll.scrollTop, + // scrollTop: state => state.scroll.scrollTop, webScale: state => state.web.scale, }), }, watch: { - scrollTop (val) { - const v = val / this.webScale; - if (v < 50) { - this.$event.$emit('nav-theme', 'dark'); - } else { - this.$event.$emit('nav-theme', 'light'); - } - const i2 = this.screen2.offsetLevel + 1; - if (v >= this.screen2.offsets[i2]) { - this.screen2.offsetLevel = i2; - } - const i3 = this.screen3.offsetLevel + 1; - if (v >= this.screen3.offsets[i3]) { - this.screen3.offsetLevel = i3; - } - const i4 = this.screen4.offsetLevel + 1; - if (v >= this.screen4.offsets[i4]) { - this.screen4.offsetLevel = i4; - } - }, + // scrollTop (val) { + // const v = val / this.webScale; + // if (v < 50) { + // this.$event.$emit('nav-theme', 'dark'); + // } else { + // this.$event.$emit('nav-theme', 'light'); + // } + // const i2 = this.screen2.offsetLevel + 1; + // if (v >= this.screen2.offsets[i2]) { + // this.screen2.offsetLevel = i2; + // } + // const i3 = this.screen3.offsetLevel + 1; + // if (v >= this.screen3.offsets[i3]) { + // this.screen3.offsetLevel = i3; + // } + // const i4 = this.screen4.offsetLevel + 1; + // if (v >= this.screen4.offsets[i4]) { + // this.screen4.offsetLevel = i4; + // } + // }, $route () { if (this.$route.hash) { this.forceScroll({ diff --git a/src/views/IndustryDynamics/Index.vue b/src/views/IndustryDynamics/Index.vue index 7028172..bcbe991 100644 --- a/src/views/IndustryDynamics/Index.vue +++ b/src/views/IndustryDynamics/Index.vue @@ -94,31 +94,31 @@ export default { }, computed: { ...mapState({ - scrollTop: state => state.scroll.scrollTop, + // scrollTop: state => state.scroll.scrollTop, webScale: state => state.web.scale, }), }, watch: { - scrollTop (val) { - const v = val / this.webScale; - if (v < 50) { - this.$event.$emit('nav-theme', 'dark'); - } else { - this.$event.$emit('nav-theme', 'light'); - } - const i2 = this.screen2.offsetLevel + 1; - if (v >= this.screen2.offsets[i2]) { - this.screen2.offsetLevel = i2; - } - const i3 = this.screen3.offsetLevel + 1; - if (v >= this.screen3.offsets[i3]) { - this.screen3.offsetLevel = i3; - } - const i4 = this.screen4.offsetLevel + 1; - if (v >= this.screen4.offsets[i4]) { - this.screen4.offsetLevel = i4; - } - }, + // scrollTop (val) { + // const v = val / this.webScale; + // if (v < 50) { + // this.$event.$emit('nav-theme', 'dark'); + // } else { + // this.$event.$emit('nav-theme', 'light'); + // } + // const i2 = this.screen2.offsetLevel + 1; + // if (v >= this.screen2.offsets[i2]) { + // this.screen2.offsetLevel = i2; + // } + // const i3 = this.screen3.offsetLevel + 1; + // if (v >= this.screen3.offsets[i3]) { + // this.screen3.offsetLevel = i3; + // } + // const i4 = this.screen4.offsetLevel + 1; + // if (v >= this.screen4.offsets[i4]) { + // this.screen4.offsetLevel = i4; + // } + // }, $route () { if (this.$route.hash) { this.forceScroll({ diff --git a/src/views/NewsTrends/Index.vue b/src/views/NewsTrends/Index.vue index 58d5c34..e5b4940 100644 --- a/src/views/NewsTrends/Index.vue +++ b/src/views/NewsTrends/Index.vue @@ -94,31 +94,31 @@ export default { }, computed: { ...mapState({ - scrollTop: state => state.scroll.scrollTop, + // scrollTop: state => state.scroll.scrollTop, webScale: state => state.web.scale, }), }, watch: { - scrollTop (val) { - const v = val / this.webScale; - if (v < 50) { - this.$event.$emit('nav-theme', 'dark'); - } else { - this.$event.$emit('nav-theme', 'light'); - } - const i2 = this.screen2.offsetLevel + 1; - if (v >= this.screen2.offsets[i2]) { - this.screen2.offsetLevel = i2; - } - const i3 = this.screen3.offsetLevel + 1; - if (v >= this.screen3.offsets[i3]) { - this.screen3.offsetLevel = i3; - } - const i4 = this.screen4.offsetLevel + 1; - if (v >= this.screen4.offsets[i4]) { - this.screen4.offsetLevel = i4; - } - }, + // scrollTop (val) { + // const v = val / this.webScale; + // if (v < 50) { + // this.$event.$emit('nav-theme', 'dark'); + // } else { + // this.$event.$emit('nav-theme', 'light'); + // } + // const i2 = this.screen2.offsetLevel + 1; + // if (v >= this.screen2.offsets[i2]) { + // this.screen2.offsetLevel = i2; + // } + // const i3 = this.screen3.offsetLevel + 1; + // if (v >= this.screen3.offsets[i3]) { + // this.screen3.offsetLevel = i3; + // } + // const i4 = this.screen4.offsetLevel + 1; + // if (v >= this.screen4.offsets[i4]) { + // this.screen4.offsetLevel = i4; + // } + // }, $route () { if (this.$route.hash) { this.forceScroll({ diff --git a/src/views/PolicyRegulations/Index.vue b/src/views/PolicyRegulations/Index.vue index 10a3d6e..309198c 100644 --- a/src/views/PolicyRegulations/Index.vue +++ b/src/views/PolicyRegulations/Index.vue @@ -94,31 +94,31 @@ export default { }, computed: { ...mapState({ - scrollTop: state => state.scroll.scrollTop, + // scrollTop: state => state.scroll.scrollTop, webScale: state => state.web.scale, }), }, watch: { - scrollTop (val) { - const v = val / this.webScale; - if (v < 50) { - this.$event.$emit('nav-theme', 'dark'); - } else { - this.$event.$emit('nav-theme', 'light'); - } - const i2 = this.screen2.offsetLevel + 1; - if (v >= this.screen2.offsets[i2]) { - this.screen2.offsetLevel = i2; - } - const i3 = this.screen3.offsetLevel + 1; - if (v >= this.screen3.offsets[i3]) { - this.screen3.offsetLevel = i3; - } - const i4 = this.screen4.offsetLevel + 1; - if (v >= this.screen4.offsets[i4]) { - this.screen4.offsetLevel = i4; - } - }, + // scrollTop (val) { + // const v = val / this.webScale; + // if (v < 50) { + // this.$event.$emit('nav-theme', 'dark'); + // } else { + // this.$event.$emit('nav-theme', 'light'); + // } + // const i2 = this.screen2.offsetLevel + 1; + // if (v >= this.screen2.offsets[i2]) { + // this.screen2.offsetLevel = i2; + // } + // const i3 = this.screen3.offsetLevel + 1; + // if (v >= this.screen3.offsets[i3]) { + // this.screen3.offsetLevel = i3; + // } + // const i4 = this.screen4.offsetLevel + 1; + // if (v >= this.screen4.offsets[i4]) { + // this.screen4.offsetLevel = i4; + // } + // }, $route () { if (this.$route.hash) { this.forceScroll({