diff --git a/src/assets/images/page/about.png b/src/assets/images/page/about.png
index 408f83e..06ded85 100644
Binary files a/src/assets/images/page/about.png and b/src/assets/images/page/about.png differ
diff --git a/src/assets/images/page/aboutUs.png b/src/assets/images/page/aboutUs.png
index 80f7cd2..bf28d13 100644
Binary files a/src/assets/images/page/aboutUs.png and b/src/assets/images/page/aboutUs.png differ
diff --git a/src/assets/images/page/application.png b/src/assets/images/page/application.png
index c69169b..976db05 100644
Binary files a/src/assets/images/page/application.png and b/src/assets/images/page/application.png differ
diff --git a/src/assets/images/page/careers.png b/src/assets/images/page/careers.png
index f6383a6..03f1a4b 100644
Binary files a/src/assets/images/page/careers.png and b/src/assets/images/page/careers.png differ
diff --git a/src/assets/images/page/contactUs.png b/src/assets/images/page/contactUs.png
index 0f44f2d..6d9a4af 100644
Binary files a/src/assets/images/page/contactUs.png and b/src/assets/images/page/contactUs.png differ
diff --git a/src/assets/images/page/devHistory.png b/src/assets/images/page/devHistory.png
index 174b7d7..e9da7ad 100644
Binary files a/src/assets/images/page/devHistory.png and b/src/assets/images/page/devHistory.png differ
diff --git a/src/assets/images/page/deviceIntroBeam.png b/src/assets/images/page/deviceIntroBeam.png
index b52e60d..90b0b8c 100644
Binary files a/src/assets/images/page/deviceIntroBeam.png and b/src/assets/images/page/deviceIntroBeam.png differ
diff --git a/src/assets/images/page/deviceIntroLayout.png b/src/assets/images/page/deviceIntroLayout.png
index be5b287..7bb7ef9 100644
Binary files a/src/assets/images/page/deviceIntroLayout.png and b/src/assets/images/page/deviceIntroLayout.png differ
diff --git a/src/assets/images/page/deviceIntroLinear.png b/src/assets/images/page/deviceIntroLinear.png
index 30fff50..8f4485f 100644
Binary files a/src/assets/images/page/deviceIntroLinear.png and b/src/assets/images/page/deviceIntroLinear.png differ
diff --git a/src/assets/images/page/edu.png b/src/assets/images/page/edu.png
index f8d1423..43fba86 100644
Binary files a/src/assets/images/page/edu.png and b/src/assets/images/page/edu.png differ
diff --git a/src/assets/images/page/estateEvent.png b/src/assets/images/page/estateEvent.png
index da7a20c..dd3be08 100644
Binary files a/src/assets/images/page/estateEvent.png and b/src/assets/images/page/estateEvent.png differ
diff --git a/src/assets/images/page/estateIndex.png b/src/assets/images/page/estateIndex.png
index 8a5a9be..98e493a 100644
Binary files a/src/assets/images/page/estateIndex.png and b/src/assets/images/page/estateIndex.png differ
diff --git a/src/assets/images/page/estateLocation.png b/src/assets/images/page/estateLocation.png
index 6af2d60..6391fa9 100644
Binary files a/src/assets/images/page/estateLocation.png and b/src/assets/images/page/estateLocation.png differ
diff --git a/src/assets/images/page/estateOrgSetup.png b/src/assets/images/page/estateOrgSetup.png
index 104bc33..ec8eadd 100644
Binary files a/src/assets/images/page/estateOrgSetup.png and b/src/assets/images/page/estateOrgSetup.png differ
diff --git a/src/assets/images/page/estateSurvey.png b/src/assets/images/page/estateSurvey.png
index 8e36a07..6f4f9a4 100644
Binary files a/src/assets/images/page/estateSurvey.png and b/src/assets/images/page/estateSurvey.png differ
diff --git a/src/assets/images/page/exp.png b/src/assets/images/page/exp.png
index e99c067..29e133c 100644
Binary files a/src/assets/images/page/exp.png and b/src/assets/images/page/exp.png differ
diff --git a/src/assets/images/page/governance.png b/src/assets/images/page/governance.png
index f0c0b4b..2f1befc 100644
Binary files a/src/assets/images/page/governance.png and b/src/assets/images/page/governance.png differ
diff --git a/src/assets/images/page/home.png b/src/assets/images/page/home.png
index 2b3c4d4..8b7201b 100644
Binary files a/src/assets/images/page/home.png and b/src/assets/images/page/home.png differ
diff --git a/src/assets/images/page/iasf.png b/src/assets/images/page/iasf.png
index 02a9ee2..ddb128b 100644
Binary files a/src/assets/images/page/iasf.png and b/src/assets/images/page/iasf.png differ
diff --git a/src/assets/images/page/index.png b/src/assets/images/page/index.png
index a252bbe..d23309f 100644
Binary files a/src/assets/images/page/index.png and b/src/assets/images/page/index.png differ
diff --git a/src/assets/images/page/industrial.png b/src/assets/images/page/industrial.png
index f0ca585..2e88216 100644
Binary files a/src/assets/images/page/industrial.png and b/src/assets/images/page/industrial.png differ
diff --git a/src/assets/images/page/lightSources.png b/src/assets/images/page/lightSources.png
index 36f67de..3a78c4f 100644
Binary files a/src/assets/images/page/lightSources.png and b/src/assets/images/page/lightSources.png differ
diff --git a/src/assets/images/page/member.png b/src/assets/images/page/member.png
index c0ad74a..1f87cd9 100644
Binary files a/src/assets/images/page/member.png and b/src/assets/images/page/member.png differ
diff --git a/src/assets/images/page/mission.png b/src/assets/images/page/mission.png
index 06e2e49..d90b016 100644
Binary files a/src/assets/images/page/mission.png and b/src/assets/images/page/mission.png differ
diff --git a/src/assets/images/page/news.png b/src/assets/images/page/news.png
index af0e332..9087aee 100644
Binary files a/src/assets/images/page/news.png and b/src/assets/images/page/news.png differ
diff --git a/src/assets/images/page/newsPress.png b/src/assets/images/page/newsPress.png
index 2aa3c44..189fc85 100644
Binary files a/src/assets/images/page/newsPress.png and b/src/assets/images/page/newsPress.png differ
diff --git a/src/assets/images/page/newsProcurement.png b/src/assets/images/page/newsProcurement.png
index fc285aa..e1e50c2 100644
Binary files a/src/assets/images/page/newsProcurement.png and b/src/assets/images/page/newsProcurement.png differ
diff --git a/src/assets/images/page/org.png b/src/assets/images/page/org.png
index 5c724b4..3649ca3 100644
Binary files a/src/assets/images/page/org.png and b/src/assets/images/page/org.png differ
diff --git a/src/assets/images/page/overview.png b/src/assets/images/page/overview.png
index a04c870..040b413 100644
Binary files a/src/assets/images/page/overview.png and b/src/assets/images/page/overview.png differ
diff --git a/src/assets/images/page/overviewDevHistory.png b/src/assets/images/page/overviewDevHistory.png
index 88a3636..cb1d976 100644
Binary files a/src/assets/images/page/overviewDevHistory.png and b/src/assets/images/page/overviewDevHistory.png differ
diff --git a/src/assets/images/page/overviewIntro.png b/src/assets/images/page/overviewIntro.png
index 7ed7aa8..cb3b99d 100644
Binary files a/src/assets/images/page/overviewIntro.png and b/src/assets/images/page/overviewIntro.png differ
diff --git a/src/assets/images/page/overviewLocation.png b/src/assets/images/page/overviewLocation.png
index bbc0a89..80a51fc 100644
Binary files a/src/assets/images/page/overviewLocation.png and b/src/assets/images/page/overviewLocation.png differ
diff --git a/src/assets/images/page/overviewSetup.png b/src/assets/images/page/overviewSetup.png
index ce2055f..18443e9 100644
Binary files a/src/assets/images/page/overviewSetup.png and b/src/assets/images/page/overviewSetup.png differ
diff --git a/src/assets/images/page/overviewTrailer.png b/src/assets/images/page/overviewTrailer.png
index fd78de0..a69c067 100644
Binary files a/src/assets/images/page/overviewTrailer.png and b/src/assets/images/page/overviewTrailer.png differ
diff --git a/src/assets/images/page/research.png b/src/assets/images/page/research.png
index 78d0119..74bf449 100644
Binary files a/src/assets/images/page/research.png and b/src/assets/images/page/research.png differ
diff --git a/src/assets/images/page/researchTeam.png b/src/assets/images/page/researchTeam.png
index 2e85257..1599856 100644
Binary files a/src/assets/images/page/researchTeam.png and b/src/assets/images/page/researchTeam.png differ
diff --git a/src/assets/images/page/science.png b/src/assets/images/page/science.png
index 633f732..33d1568 100644
Binary files a/src/assets/images/page/science.png and b/src/assets/images/page/science.png differ
diff --git a/src/assets/images/page/scientific.png b/src/assets/images/page/scientific.png
index c80fe9b..960487f 100644
Binary files a/src/assets/images/page/scientific.png and b/src/assets/images/page/scientific.png differ
diff --git a/src/assets/images/page/sfel.png b/src/assets/images/page/sfel.png
index c642a8b..8e313f4 100644
Binary files a/src/assets/images/page/sfel.png and b/src/assets/images/page/sfel.png differ
diff --git a/src/assets/images/page/shop.png b/src/assets/images/page/shop.png
index a252bbe..d23309f 100644
Binary files a/src/assets/images/page/shop.png and b/src/assets/images/page/shop.png differ
diff --git a/src/assets/images/page/speech.png b/src/assets/images/page/speech.png
index 77d073f..6b280ee 100644
Binary files a/src/assets/images/page/speech.png and b/src/assets/images/page/speech.png differ
diff --git a/src/assets/images/page/supplier.png b/src/assets/images/page/supplier.png
index 7f4c692..a3e65f6 100644
Binary files a/src/assets/images/page/supplier.png and b/src/assets/images/page/supplier.png differ
diff --git a/src/assets/images/page/survey.png b/src/assets/images/page/survey.png
index fd78de0..a69c067 100644
Binary files a/src/assets/images/page/survey.png and b/src/assets/images/page/survey.png differ
diff --git a/src/assets/images/page/talent.png b/src/assets/images/page/talent.png
index d4f80e0..caab528 100644
Binary files a/src/assets/images/page/talent.png and b/src/assets/images/page/talent.png differ
diff --git a/src/assets/images/page/talentCenter.png b/src/assets/images/page/talentCenter.png
index 24bc488..232efde 100644
Binary files a/src/assets/images/page/talentCenter.png and b/src/assets/images/page/talentCenter.png differ
diff --git a/src/assets/images/page/talentCentre.png b/src/assets/images/page/talentCentre.png
index 4eb33c2..e0041dc 100644
Binary files a/src/assets/images/page/talentCentre.png and b/src/assets/images/page/talentCentre.png differ
diff --git a/src/assets/images/page/team.png b/src/assets/images/page/team.png
index 3c55df3..a65ef6a 100644
Binary files a/src/assets/images/page/team.png and b/src/assets/images/page/team.png differ
diff --git a/src/assets/images/page/userSharing.png b/src/assets/images/page/userSharing.png
index 259c7c9..6478796 100644
Binary files a/src/assets/images/page/userSharing.png and b/src/assets/images/page/userSharing.png differ
diff --git a/src/assets/images/style/10.png b/src/assets/images/style/10.png
index cdd602f..5fd5a5b 100644
Binary files a/src/assets/images/style/10.png and b/src/assets/images/style/10.png differ
diff --git a/src/assets/images/style/11.png b/src/assets/images/style/11.png
index be4e654..8d190b6 100644
Binary files a/src/assets/images/style/11.png and b/src/assets/images/style/11.png differ
diff --git a/src/assets/images/style/12.png b/src/assets/images/style/12.png
index 041b374..2458e3f 100644
Binary files a/src/assets/images/style/12.png and b/src/assets/images/style/12.png differ
diff --git a/src/assets/images/style/13.png b/src/assets/images/style/13.png
index 5b0c915..9f9cb96 100644
Binary files a/src/assets/images/style/13.png and b/src/assets/images/style/13.png differ
diff --git a/src/assets/images/style/14.png b/src/assets/images/style/14.png
index 5b0c915..9f9cb96 100644
Binary files a/src/assets/images/style/14.png and b/src/assets/images/style/14.png differ
diff --git a/src/assets/images/style/15.png b/src/assets/images/style/15.png
index 5a03308..ebbf96e 100644
Binary files a/src/assets/images/style/15.png and b/src/assets/images/style/15.png differ
diff --git a/src/assets/images/style/16.png b/src/assets/images/style/16.png
index 82c48dd..1d26651 100644
Binary files a/src/assets/images/style/16.png and b/src/assets/images/style/16.png differ
diff --git a/src/assets/images/style/17.png b/src/assets/images/style/17.png
index 0cae53f..1dbbde0 100644
Binary files a/src/assets/images/style/17.png and b/src/assets/images/style/17.png differ
diff --git a/src/assets/images/style/18.png b/src/assets/images/style/18.png
index 0cae53f..1dbbde0 100644
Binary files a/src/assets/images/style/18.png and b/src/assets/images/style/18.png differ
diff --git a/src/assets/images/style/19.png b/src/assets/images/style/19.png
index 041b374..2458e3f 100644
Binary files a/src/assets/images/style/19.png and b/src/assets/images/style/19.png differ
diff --git a/src/assets/images/style/22.png b/src/assets/images/style/22.png
index 55814b1..b862b9b 100644
Binary files a/src/assets/images/style/22.png and b/src/assets/images/style/22.png differ
diff --git a/src/assets/images/style/23.png b/src/assets/images/style/23.png
index 042b8ea..709d577 100644
Binary files a/src/assets/images/style/23.png and b/src/assets/images/style/23.png differ
diff --git a/src/assets/images/style/24.png b/src/assets/images/style/24.png
index 41e9e34..3abbc0a 100644
Binary files a/src/assets/images/style/24.png and b/src/assets/images/style/24.png differ
diff --git a/src/assets/images/style/25.png b/src/assets/images/style/25.png
index 93cdafa..d623739 100644
Binary files a/src/assets/images/style/25.png and b/src/assets/images/style/25.png differ
diff --git a/src/assets/images/style/26.png b/src/assets/images/style/26.png
index 1928b13..89cfab0 100644
Binary files a/src/assets/images/style/26.png and b/src/assets/images/style/26.png differ
diff --git a/src/assets/images/style/27.png b/src/assets/images/style/27.png
index 5b0c915..9f9cb96 100644
Binary files a/src/assets/images/style/27.png and b/src/assets/images/style/27.png differ
diff --git a/src/assets/images/style/28.png b/src/assets/images/style/28.png
index 5b0c915..9f9cb96 100644
Binary files a/src/assets/images/style/28.png and b/src/assets/images/style/28.png differ
diff --git a/src/assets/images/style/44.png b/src/assets/images/style/44.png
index 6213e81..4b88b38 100644
Binary files a/src/assets/images/style/44.png and b/src/assets/images/style/44.png differ
diff --git a/src/assets/images/style/45.png b/src/assets/images/style/45.png
index 4b80db7..6f20bc0 100644
Binary files a/src/assets/images/style/45.png and b/src/assets/images/style/45.png differ
diff --git a/src/assets/images/style/46.png b/src/assets/images/style/46.png
index cbd6a57..b8c77aa 100644
Binary files a/src/assets/images/style/46.png and b/src/assets/images/style/46.png differ
diff --git a/src/assets/images/style/47.png b/src/assets/images/style/47.png
index 266ab8d..e395e10 100644
Binary files a/src/assets/images/style/47.png and b/src/assets/images/style/47.png differ
diff --git a/src/assets/images/style/48.png b/src/assets/images/style/48.png
index 042b8ea..709d577 100644
Binary files a/src/assets/images/style/48.png and b/src/assets/images/style/48.png differ
diff --git a/src/assets/images/style/55.png b/src/assets/images/style/55.png
index 634a3a4..d9b79d8 100644
Binary files a/src/assets/images/style/55.png and b/src/assets/images/style/55.png differ
diff --git a/src/assets/images/style/68.png b/src/assets/images/style/68.png
index 3c42d8a..6b9b81d 100644
Binary files a/src/assets/images/style/68.png and b/src/assets/images/style/68.png differ
diff --git a/src/assets/images/style/69.png b/src/assets/images/style/69.png
index 97c8c65..4f76e51 100644
Binary files a/src/assets/images/style/69.png and b/src/assets/images/style/69.png differ
diff --git a/src/assets/images/style/72.png b/src/assets/images/style/72.png
index 5020f88..b6c29a2 100644
Binary files a/src/assets/images/style/72.png and b/src/assets/images/style/72.png differ
diff --git a/src/assets/images/style/74.png b/src/assets/images/style/74.png
index 5b0c915..9f9cb96 100644
Binary files a/src/assets/images/style/74.png and b/src/assets/images/style/74.png differ
diff --git a/src/assets/images/style/77.png b/src/assets/images/style/77.png
index 53be52e..00c74bf 100644
Binary files a/src/assets/images/style/77.png and b/src/assets/images/style/77.png differ
diff --git a/src/assets/images/style/78.png b/src/assets/images/style/78.png
index 2b42b1e..a3d1309 100644
Binary files a/src/assets/images/style/78.png and b/src/assets/images/style/78.png differ
diff --git a/src/assets/images/style/79.png b/src/assets/images/style/79.png
index 2b42b1e..337d256 100644
Binary files a/src/assets/images/style/79.png and b/src/assets/images/style/79.png differ
diff --git a/src/assets/images/style/80.png b/src/assets/images/style/80.png
index 5020f88..b6c29a2 100644
Binary files a/src/assets/images/style/80.png and b/src/assets/images/style/80.png differ
diff --git a/src/assets/images/style/81.png b/src/assets/images/style/81.png
index 884b63e..154fc49 100644
Binary files a/src/assets/images/style/81.png and b/src/assets/images/style/81.png differ
diff --git a/src/const/modules.js b/src/const/modules.js
index 7c229e3..2a795f6 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -172,17 +172,19 @@ export default {
       type: 'introduce',
       forms: [
         {
-          type: 'upload',
+          type: 'media',
           prop: 'pic',
-          label: '图片',
+          label: '资源',
           required: true,
-          crop: false
+          width: 1912,
+          height: 480
         },
         {
-          type: 'input',
-          prop: 'title',
-          label: '标题',
-          required: true
+          type: 'editor',
+          prop: 'des',
+          label: '描述',
+          pureText: true, // 编辑的时候是富文本，但是外面表格里展示的时候是纯文本(富文本里文字图片过大影响表格展示才需要用此方式)
+          pureProp: 'pureDes', // 跟pureText绑定的属性，有pureText才会有此字段，用以表格里展示纯文本
         },
         {
           type: 'link',
@@ -190,14 +192,33 @@ export default {
           label: '链接'
         },
         {
-          type: 'textarea',
-          prop: 'des',
-          label: '描述'
-        }
+          type: 'upload',
+          prop: 'weixinPic1',
+          label: '公众号二维码',
+          width: 103,
+          height: 103
+        },
+        {
+          type: 'input',
+          prop: 'weixinText1',
+          label: '公众号文案'
+        },
+        {
+          type: 'upload',
+          prop: 'weixinPic2',
+          label: '小程序二维码',
+          width: 103,
+          height: 103
+        },
+        {
+          type: 'input',
+          prop: 'weixinText2',
+          label: '小程序文案'
+        },
       ],
       form: {
         pic: '',
-        title: '',
+        des: ``,
         link: {
           linkName: '无',
           connectionType: 1,
@@ -209,13 +230,17 @@ export default {
           otherArticleId: '',
           isOpen: 1
         },
-        des: '',
+        pic: '',
+        weixinPic1: '',
+        weixinText1: ``,
+        weixinPic2: '',
+        weixinText2: ``,
         isEnable: 1
       },
       list: [
         {
           pic: 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20230904/png/1698579017697353728.png',
-          title: '最全，最新的实验教学产品中心',
+          mediaType: 'png',
           link: {
             linkName: '无',
             connectionType: 1,
@@ -227,11 +252,18 @@ export default {
             otherArticleId: '',
             isOpen: 1
           },
-          des: '稳定高效的在线实验教学与学习系统',
-          isEnable: 1
+          des: '<h6 style="margin-bottom: 25px;font-size: 2.2rem;color: #fff;">数字经济实训产品哪里有？</h6><p style="font-size: 1.5rem;color: #fff;">职站商城，让您一站式采购无忧</p>',
+          weixinPic1: '',
+          weixinText1: ``,
+          weixinPic2: '',
+          weixinText2: ``,
+          isEnable: 1,
         }
-      ]
+      ],
+      dialogWidth: '1200px',
+      labelWidth: '110px'
     },
+
     {
       type: 'introduce',
       forms: [
@@ -515,6 +547,7 @@ export default {
         weixinText1: ``,
         weixinPic2: '',
         weixinText2: ``,
+        isEnable: 1,
       },
       list: [],
       dialogWidth: '1200px',
diff --git a/src/pages/column/page/aboutUs.vue b/src/pages/column/page/aboutUs.vue
index ae40d69..1333820 100644
--- a/src/pages/column/page/aboutUs.vue
+++ b/src/pages/column/page/aboutUs.vue
@@ -26,13 +26,13 @@
               <div class="text-wrap">
                 <div class="text" v-html="item.des"></div>
                 <div v-if="!GTA" class="qrcodes">
-                  <div class="qrcode">
+                  <div v-if="item.weixinPic1" class="qrcode">
                     <img width="103" :src="item.weixinPic1" alt="">
-                    <p class="text">{{ item.weixinText1 }}</p>
+                    <p v-if="item.weixinText1" class="text">{{ item.weixinText1 }}</p>
                   </div>
-                  <div class="qrcode m-l-30">
+                  <div v-if="item.weixinPic2" class="qrcode m-l-30">
                     <img width="103" :src="item.weixinPic2" alt="">
-                    <p class="text">{{ item.weixinText2 }}</p>
+                    <p v-if="item.weixinText2" class="text">{{ item.weixinText2 }}</p>
                   </div>
                 </div>
               </div>
diff --git a/src/pages/column/page/shop.vue b/src/pages/column/page/shop.vue
index 04e6873..7bab520 100644
--- a/src/pages/column/page/shop.vue
+++ b/src/pages/column/page/shop.vue
@@ -12,11 +12,28 @@
 
     <div class="modules">
       <div class="relative">
-        <el-carousel height="500px"
+        <el-carousel height="354px" class="carousel"
           :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
           <template v-for="(item, i) in modules[0].list">
             <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-              <img width="100%" height="100%" :src="item.pic" alt="">
+              <div v-if="isImg(item.mediaType)" class="pic" :style="{ backgroundImage: 'url(' + item.pic + ')' }"></div>
+              <video v-else class="pic" width="100%" height="100%" autoplay muted loop>
+                <source :src="item.pic" type="video/mp4">
+                您的浏览器不支持 video 标签。
+              </video>
+              <div class="text-wrap">
+                <div class="text" v-html="item.des"></div>
+                <div class="qrcodes">
+                  <div v-if="item.weixinPic1" class="qrcode">
+                    <img width="103" :src="item.weixinPic1" alt="">
+                    <p v-if="item.weixinText1" class="text">{{ item.weixinText1 }}</p>
+                  </div>
+                  <div v-if="item.weixinPic2" class="qrcode m-l-30">
+                    <img width="103" :src="item.weixinPic2" alt="">
+                    <p v-if="item.weixinText2" class="text">{{ item.weixinText2 }}</p>
+                  </div>
+                </div>
+              </div>
             </el-carousel-item>
           </template>
         </el-carousel>
@@ -44,10 +61,12 @@
 <script>
 import mixins from '@/mixins/page'
 import Modules from '@/const/modules'
+import Util from '@/libs/util'
 export default {
   mixins: [mixins],
   data () {
     return {
+      isImg: Util.isImg,
       modules: Modules.shop
     }
   },
@@ -61,6 +80,45 @@ export default {
 <style lang="scss" scoped>
 @import '../../../styles/page/page.scss';
 
+.carousel {
+  .pic {
+    height: 100%;
+    background-position: center center;
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+  }
+
+  /deep/.el-carousel__container {
+    height: 100%;
+  }
+
+  .text-wrap {
+    position: absolute;
+    top: 55%;
+    left: 12%;
+    display: flex;
+    align-items: center;
+    color: #fff;
+    transform: translateY(-50%);
+  }
+
+  .qrcodes {
+    display: flex;
+    margin-right: 50px;
+  }
+
+  .qrcode {
+    text-align: center;
+
+    .text {
+      margin-top: 10px;
+      font-size: 12px;
+      color: #fff;
+    }
+  }
+}
+
+
 .intro {
   display: flex;
   justify-content: space-between;
diff --git a/src/pages/logo/index.vue b/src/pages/logo/index.vue
index 88496af..f052002 100644
--- a/src/pages/logo/index.vue
+++ b/src/pages/logo/index.vue
@@ -1,22 +1,39 @@
 <template>
   <div class="page">
-    <el-form ref="form" label-width="100px">
+    <el-form ref="form" label-width="120px">
       <el-form-item label="标题">
         <el-input v-model="form.title" ref="account" placeholder="请输入标题" style="width: 400px"></el-input>
       </el-form-item>
-      <el-form-item label="图标">
+      <el-form-item label="彩色图标">
         <el-upload accept=".jpg,.png,.jpeg,.svg" :action="this.api.upload" :on-remove="handleRemove"
           :on-error="uploadError" :before-remove="beforeRemove" :headers="headers" :file-list="fileList"
           :on-success="uploadSuccess">
           <div style="text-align: left;">
-            <el-button size="small" type="primary">上传logo</el-button>
-            <div class="m-t-10">
-              <img v-if="form.logoUrl" :src="form.logoUrl" class="logo">
+            <el-button size="small" type="primary">上传彩色logo</el-button>
+            <div v-if="form.logoUrl" class="m-t-10">
+              <img :src="form.logoUrl" class="logo">
             </div>
           </div>
 
           <div slot="tip" class="el-upload__tip">
-            <p>只能上传jpg/png/svg文件，请上传120*40左右的logo</p>
+            <p>只能上传jpg/png/svg图片，请上传120*40左右的彩色logo，用于常规页面展示</p>
+          </div>
+        </el-upload>
+      </el-form-item>
+
+      <el-form-item label="白色图标(非必须)">
+        <el-upload accept=".jpg,.png,.jpeg,.svg" :action="this.api.upload" :on-remove="handleRemove1"
+          :on-error="uploadError" :before-remove="beforeRemove" :headers="headers" :file-list="fileList1"
+          :on-success="uploadSuccess1">
+          <div style="text-align: left;">
+            <el-button size="small" type="primary">上传白色logo</el-button>
+            <div v-if="form.whiteUrl" class="m-t-10">
+              <img :src="form.whiteUrl" class="logo">
+            </div>
+          </div>
+
+          <div slot="tip" class="el-upload__tip">
+            <p>只能上传jpg/png/svg图片，请上传120*40左右的白色logo，用于透明导航的首页展示</p>
           </div>
         </el-upload>
       </el-form-item>
@@ -42,9 +59,11 @@ export default {
         id: '',
         title: '',
         logoUrl: '',
+        whiteUrl: '',
         siteId: this.$store.state.content.site.id,
       },
       fileList: [],
+      fileList1: [],
     }
   },
   mounted () {
@@ -59,13 +78,17 @@ export default {
           name: 'logo.jpg',
           url: res.data.logoUrl
         }] : []
+        this.fileList1 = res.data.whiteUrl ? [{
+          name: 'logo.jpg',
+          url: res.data.whiteUrl
+        }] : []
       }
     },
     handleExceed () { // 上传文件
       Util.warningMsg("当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！")
     },
     // 附件上传成功
-    uploadSuccess (data) {
+    uploadSuccess (data, prop) {
       if (data.code === 401) {
         Util.errorMsg("登录过期，请重新登录")
         setTimeout(() => {
@@ -75,19 +98,33 @@ export default {
       }
       this.form.logoUrl = data.url
     },
-    uploadError (err, file, fileList) {
+    // 附件上传成功
+    uploadSuccess1 (data, prop) {
+      if (data.code === 401) {
+        Util.errorMsg("登录过期，请重新登录")
+        setTimeout(() => {
+          this.$store.dispatch('user/logout')
+        }, 1000)
+        return false
+      }
+      this.form.whiteUrl = data.url
+    },
+    uploadError () {
       this.$message({
         message: "上传出错，请重试！",
         type: "error",
         center: true
       });
     },
-    beforeRemove (file, fileList) {
+    beforeRemove (file) {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     handleRemove () {
       this.form.logoUrl = ''
     },
+    handleRemove1 () {
+      this.form.whiteUrl = ''
+    },
     async save () {
       const { form } = this
       // if (!form.logoUrl) return Util.errorMsg('请上传logo！')