diff --git a/.env.development b/.env.development
index 45eab10..22ff7c3 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
 #VUE_APP_BASE_API = 'http://localhost:8085/dev-api'
 #VUE_APP_BASE_API = '/dev-api'
 SITE_TYPE = 'NEd5n92EMIpyyBslaNqsRgE'
-VUE_APP_BASE_API = 'https://sist.swjtu.edu.cn/dev-api'
+VUE_APP_BASE_API = 'http://dpapi.feashow.cn'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/index.js b/src/api/index.js
index 6fa2bd0..dd55239 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -6,74 +6,24 @@
  */
 import request from '@/utils/request'
 
-// 获取统计数据
-export function getConfig(configKey) {
+// 获取首页轮播图
+export function getBanner() {
   return request({
-    url: '/web/config/'+configKey,
-    method: 'get',
-  })
-}
-// 获取所有导航
-export function getNavigation(data) {
-  return request({
-    url: '/web/getnavall',
+    url: '/home',
     method: 'post',
-    data:data
   })
 }
-
-// 获取节点信息(通用接口)
-export function getNode(data) {
+// 获取公共数据
+export function getPublicData() {
   return request({
-    url: '/web/node',
+    url: '/p-public_config',
     method: 'post',
-    data:data
   })
 }
-export function getNodeNav(data) {
-  return request({
-    url: '/web/nodeNav',
-    method: 'post',
-    data:data
-  })
-}
-// 获取文章列表
-export function getArticleList(data) {
-  return request({
-    url: '/web/articlelist',
-    method: 'post',
-    data:data
-  })
-}
-
-
-// 获取面包屑
-export function crumbs(id) {
-  return request({
-    url: '/web/crumbs',
-    method: 'post',
-    data:{
-      id:id
-    }
-  })
-}
-
-
-// 获取banner图
-export function banner(type) {
-  return request({
-    url: '/web/banner',
-    method: 'post',
-    data:{
-      type:type
-    }
-  })
-}
-
 // 获取文章详情
-export function article(id) {
+export function getArticleInfo(id) {
   return request({
-    url: '/web/article',
+    url: '/articleinfo',
     method: 'post',
     data:{
       id:id
@@ -81,13 +31,4 @@ export function article(id) {
   })
 }
 
-// 获取文章详情
-export function info(id) {
-  return request({
-    url: '/web/info',
-    method: 'post',
-    data:{
-      id:id
-    }
-  })
-}
+
diff --git a/src/components/Carousel.vue b/src/components/Carousel.vue
index 4d5baa9..9483ca1 100644
--- a/src/components/Carousel.vue
+++ b/src/components/Carousel.vue
@@ -1,47 +1,47 @@
 <template>
-      <div class="slideshow">
-        <el-carousel trigger="click" height="36.2vw" style="min-width: 1300px;">
-          <el-carousel-item v-for="(item,index) in bannerDate" :key="index">
-              <img :src="item.imgurl" alt="">
-          </el-carousel-item>
-        </el-carousel>
-      </div>
+  <div class="slideshow">
+    <el-carousel trigger="click" height="36.2vw" style="min-width: 1300px;">
+      <el-carousel-item v-for="(item,index) in bannerData" :key="index">
+        <img :src="item.img" alt="">
+      </el-carousel-item>
+    </el-carousel>
+  </div>
 </template>
 
 <script>
+import {getBanner} from "@/api";
+
 export default {
   name: "Carousel",
   data() {
     return {
-      bannerDate: [
-        {
-          imgurl: 'http://www.yipengtaoci.com/upfiles/images/20201228/16091375066005613.jpg'
-        }, {
-          imgurl: 'http://www.yipengtaoci.com/upfiles/images/20181215/15448444195967573.jpg'
-        },
-        {
-          imgurl: 'http://www.yipengtaoci.com/upfiles/images/20181215/15448438651669858.jpg'
-        }
-      ]
-    }
+      bannerData: []
+    };
   },
-}
+  created() {
+    getBanner().then(res => {
+      this.bannerData = res.data.index_banner;
+    });
+  }
+};
 </script>
 <style scoped lang="scss">
 @media screen and (max-width: 1320px) {
-  /deep/.el-carousel__container{
-    height: 44vh!important;
+  /deep/ .el-carousel__container {
+    height: 44vh !important;
   }
 }
+
 @media screen and (max-width: 768px) {
-  /deep/.el-carousel__container{
-    height: 58vh!important;
+  /deep/ .el-carousel__container {
+    height: 58vh !important;
   }
 }
 
 .slideshow {
-  width:100%;
+  width: 100%;
 }
+
 /*.carousel_img {*/
 /*  width: 100%;*/
 /*}*/
diff --git a/src/components/ProductsTabsItem.vue b/src/components/ProductsTabsItem.vue
index 9acc714..3b21ad3 100644
--- a/src/components/ProductsTabsItem.vue
+++ b/src/components/ProductsTabsItem.vue
@@ -4,13 +4,13 @@
     <el-col :xs="1" :sm="2" :md="2" :lg="2" :xl="4"></el-col>
     <el-col :xs="22" :sm="20" :md="20" :lg="20" :xl="16">
       <el-tabs v-if="title===1" v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane v-for="(item,index) in tabList" :key="index" :label="item.label" :name="item.name">
+        <el-tab-pane v-for="(item,index) in tabList" :key="index" :label="item.title">
           关于我们
         </el-tab-pane>
       </el-tabs>
       <el-tabs v-else v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane v-for="(item,index) in tabList" :key="index" :label="item.label" :name="item.name">
-          {{ title === 0 ? '' : item.label  }}
+        <el-tab-pane v-for="(item,index) in tabList" :key="index" :label="item.title" >
+          {{ title === 0 ? '' : item.title  }}
         </el-tab-pane>
       </el-tabs>
     </el-col>
@@ -68,7 +68,7 @@ export default {
   },
   data() {
     return {
-      activeName: 'first'
+      activeName: '0'
     }
   },
   methods: {
diff --git a/src/utils/request.js b/src/utils/request.js
index 3503db4..24fd9c8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,9 +17,9 @@ const service = axios.create({
 // request拦截器
 service.interceptors.request.use(config => {
   if (config.method == 'post') {
-    config.data['sitetype'] = 'NEd5n92EMIpyyBslaNqsRgE';
+    // config.data['sitetype'] = 'NEd5n92EMIpyyBslaNqsRgE';
     let lang = sessionStorage.getItem("lang");
-    config.data['lang'] = lang;
+    // config.data['lang'] = lang;
   }
   return config
 }, error => {
diff --git a/src/views/aboutUs/index.vue b/src/views/aboutUs/index.vue
index 252b25d..546b8b6 100644
--- a/src/views/aboutUs/index.vue
+++ b/src/views/aboutUs/index.vue
@@ -9,34 +9,34 @@
       <el-col :xs="1" :sm="2" :md="2" :lg="2" :xl="4"></el-col>
       <el-col :xs="22" :sm="20" :md="20" :lg="20" :xl="16">
         <div class="introduce" id="introduce">
-          <p v-for="(item,index) in pList" :key="index">
-            {{ item.text }}
-          </p>
-        </div>
-        <div class="introduce band" id="band">
-          <p v-for="(item,index) in bandList" :key="index">
-            <span>{{ item.text1 }}</span>
-            <span>{{ item.text2 }}</span>
-          </p>
-        </div>
-        <div class="introduce band" id="ideas">
-          <p v-for="(item,index) in ideaList" :key="index">
-            <span>{{ item.text1 }}</span>
-            <span>{{ item.text2 }}</span>
-            <span>{{ item.text3 }}</span>
-          </p>
-        </div>
-        <div class="culture" id="culture">
-          <div id="culture_content" v-for="(item,index) in cultureList" :key="index" :class="'cul_'+index">
-            <div class="culture_img">
-              <img :src="item.src" alt=""/>
-            </div>
-            <div class="culture_right">
-              <span>{{ item.text1 }}</span>
-              <span>{{ item.text2 }}</span>
-            </div>
-          </div>
+<!--          <p v-for="(item,index) in pList" :key="index">-->
+            <span v-html="pList"></span>
+<!--          </p>-->
         </div>
+<!--        <div class="introduce band" id="band">-->
+<!--          <p v-for="(item,index) in bandList" :key="index">-->
+<!--            <span>{{ item.text1 }}</span>-->
+<!--            <span>{{ item.text2 }}</span>-->
+<!--          </p>-->
+<!--        </div>-->
+<!--        <div class="introduce band" id="ideas">-->
+<!--          <p v-for="(item,index) in ideaList" :key="index">-->
+<!--            <span>{{ item.text1 }}</span>-->
+<!--            <span>{{ item.text2 }}</span>-->
+<!--            <span>{{ item.text3 }}</span>-->
+<!--          </p>-->
+<!--        </div>-->
+<!--        <div class="culture" id="culture">-->
+<!--          <div id="culture_content" v-for="(item,index) in cultureList" :key="index" :class="'cul_'+index">-->
+<!--            <div class="culture_img">-->
+<!--              <img :src="item.src" alt=""/>-->
+<!--            </div>-->
+<!--            <div class="culture_right">-->
+<!--              <span>{{ item.text1 }}</span>-->
+<!--              <span>{{ item.text2 }}</span>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
       </el-col>
     </el-row>
   </div>
@@ -44,44 +44,15 @@
 
 <script>
 import ProductsTabsItem from "@/components/ProductsTabsItem";
+import {getArticleInfo} from "@/api";
 
 export default {
   name: "index",
   components: {ProductsTabsItem},
   data() {
     return {
-      aboutTabs: [
-        {
-          label: '企业简介',
-          name: 'first'
-        },
-        {
-          label: '品牌文化',
-          name: 'second'
-        },
-        {
-          label: '企业观点',
-          name: 'third'
-        },
-        {
-          label: '企业文化',
-          name: 'four'
-        }
-      ],
-      pList: [
-        {
-          text: '广东祥睿陶瓷有限公司，于2011年在中国佛山成立，在成立之初，产品精准定位于大理石品类，为设计师打造简奢风格提供瓷砖材料素材。专注于产品的研发，从整体空间应用方向进行单品的开发研究，获得国内外众多设计师的青睐与认可，海外亦有部分专卖店展示。'
-        },
-        {
-          text: '公司依托便利的区位和人才优势，积极容身于国际圈，以其独特且具备设计韵味的产品体系，在国际舞台上崭露头角。凭借其先天的国际基因，产品开发潮流化，且与意大利知名瓷砖设计机构进行过多次合作。'
-        },
-        {
-          text: '艺鹏瓷砖注重于产品的环保性能，将应用美学与环保健康结合起来，为用户寻求高品质瓷砖应用解决方案，由于其专注的匠心精神，先后获得业内多项殊荣。'
-        },
-        {
-          text: '现面向全国各地开展招商加盟业务，专业的团队，打造服务一体化的招商体系，公司以“诚信、务实、全力支持”的加盟理念为每个渴望成功的加盟商提供投资少、风险低、增值快、市场潜力无限的投资机会，不断为广大加盟商创造盈利空间，我们将与加盟商一起不断创新、追求共赢、共享全新市场的无限商机。我们深信，加入成为艺鹏特许经营加盟商，将为您自己开创出一个不一样的成就人生！'
-        }
-      ],
+      aboutTabs: [],
+      pList: [],
       bandList: [
         {
           text1: '品牌主张：把人文注入生活、品鉴艺术魅力、享受知性人生',
@@ -151,6 +122,13 @@ export default {
       ]
     }
   },
+  mounted() {
+    //获取关于我们的数据
+    getArticleInfo(1).then(res => {
+      this.aboutTabs = res.data.articlelist;
+      this.pList=res.data.articleinfo.content
+    });
+  },
   methods: {
     handleClick(tab) {
       const introduce = document.getElementById('introduce');
diff --git a/src/views/attractAndJoin/index.vue b/src/views/attractAndJoin/index.vue
index e5107e5..f9b7590 100644
--- a/src/views/attractAndJoin/index.vue
+++ b/src/views/attractAndJoin/index.vue
@@ -13,10 +13,10 @@
           <div class="support_title">
             支持策略 / SUPPORT STRATEGY
           </div>
-          <div style="font-size: 16px">
-            <p v-for="(item,index) in supportList" :key="index" style="padding-bottom: 25px">
-              {{item.text}}
-            </p>
+          <div style="font-size: 16px;padding-bottom: 25px">
+<!--            <p v-for="(item,index) in supportList" :key="index" style="">-->
+              <span v-html="supportList"></span>
+<!--            </p>-->
           </div>
         </div>
         <!--加盟条件-->
@@ -37,21 +37,14 @@
 
 <script>
 import ProductsTabsItem from "@/components/ProductsTabsItem";
+import {getArticleInfo, getPublicData} from "@/api";
 
 export default {
   name: "index",
   components:{ProductsTabsItem},
   data() {
     return {
-      joinTab: [
-        {
-          label: '支持策略',
-          name: 'first'
-        }, {
-          label: '加盟条件',
-          name: 'second'
-        }
-      ],
+      joinTab: [],
       supportList:[
         {text:'艺鹏瓷砖对合作伙伴的支持策略：'},
         {text:'1、形象店的装修补贴支持'},
@@ -64,6 +57,13 @@ export default {
       ]
     }
   },
+  mounted() {
+    //获取招商加盟的数据
+    getArticleInfo(4).then(res => {
+      this.joinTab = res.data.articlelist;
+      this.supportList=res.data.articleinfo.content
+    });
+  },
   methods: {
     handleClick(tab) {
       const support = document.getElementById('support');
diff --git a/src/views/contactUs/index.vue b/src/views/contactUs/index.vue
index f90b529..7ff9e7e 100644
--- a/src/views/contactUs/index.vue
+++ b/src/views/contactUs/index.vue
@@ -8,14 +8,14 @@
 
     <div class="contact_content">
       <p class="title">
-        <strong>广东祥睿陶瓷有限公司</strong>
+        <strong>{{ corporate_name }}</strong>
       </p>
       <p class="address">
-        地址：佛山市禅城区华夏陶瓷博览城陶博会展三环路5座B3
+        地址：{{ corporate_add }}
       </p>
-      <p class="phone">电话：0757-83551526</p>
-      <div style="margin-top: 30px;margin-bottom: 50px">
-        <img src="http://www.yipengtaoci.com/upfiles/images/20200706/15940300499317991.jpg" alt=""/>
+      <p class="phone">电话：{{ tel }}</p>
+      <div class="contact_logo">
+        <img :src="logo" alt=""/>
       </div>
     </div>
   </div>
@@ -23,21 +23,30 @@
 
 <script>
 import ProductsTabsItem from "@/components/ProductsTabsItem";
+import {getPublicData} from "@/api";
 
 export default {
   name: "index",
   components: {ProductsTabsItem},
   data() {
     return {
-      contactTabs: [
-        {
-          label: '联系我们',
-          name: 'first'
-        }
-      ]
-    }
+      contactTabs: [],
+      corporate_name: "",
+      corporate_add: "",
+      tel: "",
+      logo: "http://www.yipengtaoci.com/upfiles/images/20200706/15940300499317991.jpg"
+    };
+  },
+  mounted() {
+    getPublicData().then(res => {
+      this.corporate_name = res.data.corporate_name;
+      this.corporate_add = res.data.corporate_add;
+      this.tel = res.data.tel;
+      // this.logo = res.data.logo;
+      this.contactTabs = res.data.contact_us;
+    });
   }
-}
+};
 </script>
 
 <style scoped lang="scss">
@@ -77,6 +86,15 @@ export default {
       font-size: 16px;
       line-height: 28.8px;
     }
+
+    .contact_logo {
+      margin-top: 30px;
+      margin-bottom: 50px;
+
+      img {
+        width: 500px;
+      }
+    }
   }
 }
 </style>
diff --git a/src/views/footer/index.vue b/src/views/footer/index.vue
index 7577f92..57e9e15 100644
--- a/src/views/footer/index.vue
+++ b/src/views/footer/index.vue
@@ -1,39 +1,38 @@
 <template>
   <div class="footer_bg">
     <el-row type="flex" class="up_footer">
-        <div class="up_left">
-          <el-image
-            style="margin-bottom: 15px"
-            src="http://www.yipengtaoci.com/images/elogo.png"></el-image>
-          <div>
-            广东祥睿陶瓷有限公司
-          </div>
-        </div>
-        <div class="up_middle">
-          <ul>
-            <li v-for="(footerItem,footerIndex) in footerList" :key="footerIndex">
-              <a>{{ footerItem.title }}</a>
-              <div class="item" v-for="(footerItems,footerItemsIndex) in footerItem.items" :key="footerItemsIndex">
-                  <a>{{ footerItems.name }}</a>
-              </div>
-            </li>
-          </ul>
-        </div>
-        <div class="up_right">
-          <el-image
-            style="width: 100px; height: 100px"
-            src="http://www.yipengtaoci.com/upfiles/images/20200706/15940289752944272.jpg"></el-image>
+      <div class="up_left">
+        <el-image
+          :src="logo"></el-image>
+        <div>
+          {{ corporate_name }}
         </div>
+      </div>
+      <div class="up_middle">
+        <ul>
+          <li v-for="(footerItem,footerIndex) in footerList" :key="footerIndex">
+            <a>{{ footerItem.title }}</a>
+            <div class="item" v-for="(footerItems,footerItemsIndex) in footerItem.items" :key="footerItemsIndex">
+              <a>{{ footerItems.name }}</a>
+            </div>
+          </li>
+        </ul>
+      </div>
+      <div class="up_right">
+        <el-image
+          style="width: 100px; height: 100px"
+          src="http://www.yipengtaoci.com/upfiles/images/20200706/15940289752944272.jpg"></el-image>
+      </div>
     </el-row>
     <el-row type="flex" class="down_footer">
       <el-col :span="3">
       </el-col>
       <el-col :span="18">
         <div>
-          版权所有©广东祥睿陶瓷有限公司 2018-2019 未经本网书面授权，请勿转载、摘编或建立镜像，否则视为侵权。
+          版权所有©{{ corporate_name }} 2018-2019 未经本网书面授权，请勿转载、摘编或建立镜像，否则视为侵权。
         </div>
         <div>
-          地址：佛山市禅城区华夏陶瓷博览城陶博会展三环路5座B3 技术支持：弈天网络
+          地址：{{ corporate_add }} 技术支持：弈天网络
         </div>
       </el-col>
     </el-row>
@@ -41,92 +40,107 @@
 </template>
 
 <script>
+import {getPublicData} from "@/api";
+
 export default {
   name: "index",
   data() {
     return {
+      logo: "",
+      corporate_name: "",
+      corporate_add: "",
       footerList: [
         {
-          title: '关于我们',
+          title: "关于我们",
           items: [
             {
-              name: '企业简介'
+              name: "企业简介"
             },
             {
-              name: '品牌文化'
+              name: "品牌文化"
             },
             {
-              name: '企业观点'
+              name: "企业观点"
             }
           ]
         },
         {
-          title: '新闻资讯',
+          title: "新闻资讯",
           items: [
             {
-              name: '公司新闻'
+              name: "公司新闻"
             },
             {
-              name: '行业动态'
+              name: "行业动态"
             },
             {
-              name: '瓷砖百科'
+              name: "瓷砖百科"
             }
           ]
         },
         {
-          title: '形象展示',
+          title: "形象展示",
           items: [
             {
-              name: '资质荣誉'
+              name: "资质荣誉"
             },
             {
-              name: '工程案例'
+              name: "工程案例"
             }
           ]
         },
         {
-          title: '招商加盟',
+          title: "招商加盟",
           items: [
             {
-              name: '支持策略'
+              name: "支持策略"
             },
             {
-              name: '加盟条件'
+              name: "加盟条件"
             }
           ]
         },
         {
-          title: '联系我们',
+          title: "联系我们",
           items: [
             {
-              name: '联系方式'
+              name: "联系方式"
             }
           ]
         }
       ]
-    }
+    };
+  },
+  mounted() {
+    getPublicData().then(res => {
+      this.logo = res.data.logo;
+      this.corporate_name = res.data.corporate_name;
+      this.corporate_add = res.data.corporate_add;
+    });
   }
-}
+};
 </script>
 
 <style scoped lang="scss">
 @media screen and (max-width: 1660px) {
   .up_footer {
-    width: 1230px!important;
+    width: 1230px !important;
   }
 }
+
 @media screen and (max-width: 1480px) {
   .up_footer {
-    width: 1100px!important;
+    width: 1100px !important;
   }
 }
+
 .footer_bg {
   height: 276px;
   width: 100%;
   background-color: #111;
   color: #fff;
   min-width: 1300px;
+
   .up_footer {
     position: relative;
     width: 1360px;
@@ -139,6 +153,14 @@ export default {
       float: left;
       margin-right: 15px;
 
+      /deep/.el-image {
+        margin-bottom: 15px;
+        .el-image__inner{
+          width: 251px!important;
+          height: 44px!important;
+        }
+      }
+
       > div {
         font-size: 14px;
         clear: both;
@@ -175,10 +197,12 @@ export default {
           .item {
             color: #aaa;
             font-size: 13px;
-              > a {
-                line-height: 24px;
-              }
-            > a:hover{
+
+            > a {
+              line-height: 24px;
+            }
+
+            > a:hover {
               text-decoration: underline;
             }
           }
diff --git a/src/views/header/index.vue b/src/views/header/index.vue
index e2742c9..cb633ff 100644
--- a/src/views/header/index.vue
+++ b/src/views/header/index.vue
@@ -7,7 +7,7 @@
               艺鹏瓷砖 —— 拒绝千篇一律，艺术无处不在
             </span>
           <span class="up_right">
-              广东祥睿陶瓷有限公司
+              {{corporate_name}}
             </span>
         </div>
       </div>
@@ -15,7 +15,7 @@
         <div class="down_left">
           <a href="/">
             <el-image
-              src="http://www.yipengtaoci.com/images/logo.png"></el-image>
+              :src="logo"></el-image>
           </a>
         </div>
         <div class="down_right">
@@ -54,10 +54,14 @@
 </template>
 
 <script>
+import {getPublicData} from "@/api";
+
 export default {
   name: "index",
   data() {
     return {
+      logo:'http://www.yipengtaoci.com/images/logo.png',
+      corporate_name:'',
       navList: [
         {
           href: '/',
@@ -166,6 +170,12 @@ export default {
     }
   },
   mounted() {
+    getPublicData().then(res => {
+      console.log('公共数据',res.data);
+      this.logo = res.data.logo;
+      this.corporate_name = res.data.corporate_name;
+      // sessionStorage.setItem("lang", res.data.corporate_name)
+    });
     let header_bg = document.getElementById('header_bg')
     let search_header = document.getElementById('search_header')
 
@@ -262,9 +272,13 @@ export default {
 
     .down_left {
       position: absolute;
-      top: -30px;
       float: left;
-
+      /deep/.el-image {
+        .el-image__inner{
+          width: 323px!important;
+          height: 85px!important;
+        }
+      }
       > a:hover:after {
         border: none;
       }