From cd2c344b096db85715c51e50500d468d277d1dc6 Mon Sep 17 00:00:00 2001
From: dzj <1140318653@qq.com>
Date: Mon, 8 Jul 2024 19:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=8A=A0=E8=BD=BD=E4=B8=AD?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js        |  6 ++++++
 src/views/contactus.vue | 40 ++++++++++++++++++++++++----------------
 src/views/news.vue      | 17 ++++++++++++-----
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index c9c667a..4dbdf47 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -119,4 +119,10 @@ export function getcruit(){
     return request({
         url:'/recruit/list'
     })
+} 
+//联系我们
+export function concatinfo(){
+    return request({
+        url:'/contactus/list '
+    })
 } 
\ No newline at end of file
diff --git a/src/views/contactus.vue b/src/views/contactus.vue
index bfac071..b38adcf 100644
--- a/src/views/contactus.vue
+++ b/src/views/contactus.vue
@@ -13,26 +13,26 @@
         </div>
         <div style="height: 80px;"></div>
         <div class="content">
-            <div class="bg" >
+            <div class="bg" :style="`background-image:url(${cartinfo.pic})`">
                     <div class="slogan wow fadeInUp animated" style="animation-delay: 0.1s; visibility: visible; animation-name: fadeInUp;">
-                        <h3>为客户创造价值</h3>
-                        <h5>CREATING VALUE</h5>
+                        <h3>{{cartinfo.title}}</h3>
+                        <h5>{{cartinfo.englishNa}}</h5>
                     </div>
                     <div class="text wow fadeInUp animated" style="animation-delay: 0.3s; visibility: visible; animation-name: fadeInUp;">
-                        <h3>飞阳建设工程有限公司</h3>
-                       <p>地址：福建省莆田市荔城区荔园中路西侧50米飞阳建设工程有限公司
+                        <h3>{{cartinfo.companyName}}</h3>
+                       <p>地址：{{cartinfo.site}}
 </p>
-<p>电话：05943613551</p>
-<p>传真：05943613551</p>
-<p>邮箱：1053059120@qq.com</p>
-<p class="no_margin">网址：https://www.fygroup.cn
+<p>电话：{{cartinfo.phone}}</p>
+<p>传真：{{cartinfo.phone}}</p>
+<p>邮箱：{{cartinfo.email}}</p>
+<p class="no_margin">网址：{{cartinfo.url}}
 </p>
                     </div>
                      <div class="float">
                         <div class="introduction wow fadeInRight animated" style="animation-delay: 0.5s; visibility: visible; animation-name: fadeInRight;">
-                            <h3>关注飞阳建筑工程</h3>
-                            <h5>FOLLOW US</h5>
-                            <p class="no_margin">关注我们的社交帐号</p>
+                            <h3>{{cartinfo.rightTitle}}</h3>
+                            <h5>{{cartinfo.rightEngTitle}}</h5>
+                            <p class="no_margin">{{cartinfo.rightIntro}}</p>
                         </div>
                         <!-- <div class="socials_wrap">
                             <a href="javascript:;" class=""><span class="social_icon social_icon_wechat">
@@ -48,7 +48,7 @@
                                     <div class="weChat_img"><img src="../images/applet_bg.jpg"></div>
                                 </span></a>
                         </div> -->
-                       <img src="@/assets/images/weixin.png" style="width: 100%;">
+                       <img :src="cartinfo.weiXin" style="width: 100%;">
                     </div>
                 </div>
 <div style="height: 85px;"></div>
@@ -109,7 +109,7 @@
 
 </template>
 <script>
-import {message} from '@/api/index'
+import {message,concatinfo} from '@/api/index'
 // import { Message } from 'element-ui';
 
   export default{
@@ -137,11 +137,19 @@ import {message} from '@/api/index'
         content: [
           { required: true, message: '留言内容不能为空' }
         ]
-      }
+      },
+      cartinfo:{}
  
         }
       
     },
+    mounted(){
+        concatinfo().then((res)=>{
+             console.log('res',res.data)
+             this.cartinfo=res.data[0]
+        })
+    },
+
     methods:{
         send(params){
         console.log(params)
@@ -297,7 +305,7 @@ li {
 }
 
 .bg{
-    background-image: url('@/assets/images/cantactus.png');
+    /* background-image: url('@/assets/images/cantactus.png'); */
     position: relative;
     width: 100%;
     height: 542px;
diff --git a/src/views/news.vue b/src/views/news.vue
index 1c4351c..9134ce0 100644
--- a/src/views/news.vue
+++ b/src/views/news.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="loading">
         <div class="page_ban">
             <div class="img compbg"></div>
             <div class="content">
@@ -75,6 +75,7 @@
 <script>
 import '@/assets/images/news1.png'
 import { getnews,getmsg} from '@/api';
+import { Loading } from 'element-ui';
 export default{
     data(){
         return{
@@ -87,8 +88,12 @@ export default{
         }
     },
     mounted(){
+        let loadingInstance = Loading.service('loading');
+
        getnews({'page':0}).then((res)=>{
-        
+      
+
+
                   // 遍历数组，对每个对象的richText属性进行处理
                   res.data.content.forEach(item => {
   // 去除所有标签和空格
@@ -100,13 +105,15 @@ export default{
         
        
      this.newshow=arr   
-
+     loadingInstance.close();
        })
     },
     methods:{
         handleClick(){
             this.rest=[]
+            let loadingInstance = Loading.service('loading'); 
         if(this.activeName=='新闻资讯'){
+           
              getmsg({'page':0}).then((res)=>{
         
                   // 遍历数组，对每个对象的richText属性进行处理
@@ -118,7 +125,7 @@ export default{
       
            let arr=this.newslist.slice(0,3)
                this.newshow=arr
-
+               loadingInstance.close();
        })
         }else if(this.activeName=='企业新闻'){
             getnews({'page':0}).then((res)=>{
@@ -134,7 +141,7 @@ item.content = item.content?.replace(/<[^>]+>/g, '').trim();
 
 
 this.newshow=arr   
-
+loadingInstance.close();
 })
         }
         },