shaogen1995 3 rokov pred
rodič
commit
3a47291502

BIN
src/assets/images/gaikuang-hover.png


BIN
src/assets/images/gaikuang.png


BIN
src/assets/images/gaikuang0-hover.jpg


BIN
src/assets/images/gaikuang0.jpg


BIN
src/assets/images/gaikuang2-hover.jpg


BIN
src/assets/images/gaikuang2.jpg


BIN
src/assets/images/nav-logo.png


BIN
src/assets/images/nav-logo11.png


BIN
src/assets/images/survey-introduction.jpg


BIN
src/assets/images/survey-type-nav-bg.png


+ 20 - 0
src/assets/style/reset.less

@@ -38,3 +38,23 @@ a{text-decoration: none;}
   background-color: #9f9f9f;
   -webkit-border-radius: 4px;
 }
+.survey{
+  border-top: 2px solid #ccc;
+  background-color: #fff;
+}
+.information {
+  border-top: 2px solid #ccc;
+  background-color: #fff;
+}
+.exhibition{
+  border-top: 2px solid #ccc;
+  background-color: #fff;
+}
+.collection {
+  border-top: 2px solid #ccc;
+  background-color: #fff;
+}
+.service{
+  border-top: 2px solid #ccc;
+  background-color: #fff;
+}

+ 2 - 2
src/pages/activity/activity-detail.vue

@@ -191,7 +191,7 @@ export default {
             width: 85%;
             margin: 94px auto 0;
             .nav-con-title {
-              background: #a01c26ff;
+              background: #945335;
               padding: 14.5px 0 14.5px 46px;
               font-size: 20px;
               font-family: Microsoft YaHei;
@@ -201,7 +201,7 @@ export default {
             }
             .nav-con-type {
               margin-top: 3px;
-              background: rgba(160, 28, 38, 0.6);
+              background: rgba(148, 83, 53, .6);
               overflow: hidden;
               > ul {
                 width: 100%;

+ 4 - 4
src/pages/activity/activity-type.vue

@@ -604,7 +604,7 @@ export default {
             width: 85%;
             margin: 94px auto 0;
             .nav-con-title {
-              background: #a01c26ff;
+              background: #945335;
               padding: 14.5px 0 14.5px 46px;
               font-size: 20px;
               font-family: Microsoft YaHei;
@@ -614,7 +614,7 @@ export default {
             }
             .nav-con-type {
               margin-top: 3px;
-              background: rgba(160, 28, 38, 0.6);
+              background: rgba(148, 83, 53, .6);
               overflow: hidden;
               > ul {
                 width: 100%;
@@ -693,7 +693,7 @@ export default {
                   }
                 }
                 li.selected {
-                  background: #a01c26;
+                  background: #945335;
                 }
               }
             }
@@ -756,7 +756,7 @@ export default {
                   font-family: Microsoft YaHei;
                   font-weight: 400;
                   color: #ffffff;
-                  background: #a01c26;
+                  background: #945335;
                   border-radius: 4px;
                   cursor: pointer;
                 }

+ 43 - 43
src/pages/activity/activity.vue

@@ -25,72 +25,72 @@
 </template>
 
 <script>
-//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
-//例如:import 《组件名称》 from '《组件路径》';
+// 这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
+// 例如:import 《组件名称》 from '《组件路径》';
 
 export default {
-  name: "activity",
-  //import引入的组件需要注入到对象中才能使用
+  name: 'activity',
+  // import引入的组件需要注入到对象中才能使用
   components: {},
-  data() {
-    //这里存放数据
+  data () {
+    // 这里存放数据
     return {
-      select:'',
+      select: '',
       onLineHover: false,
-      volunteerHover:false,
-      satisfactionHover:false
-    };
+      volunteerHover: false,
+      satisfactionHover: false
+    }
   },
-  //监听属性 类似于data概念
+  // 监听属性 类似于data概念
   computed: {},
-  //监控data中的数据变化
+  // 监控data中的数据变化
   watch: {},
-  //方法集合
+  // 方法集合
   methods: {
-    toType(type) {
+    toType (type) {
       this.$router.push({path: '/activity-type', query: {type}})
     },
-    mouseOver(type){
+    mouseOver (type) {
       this.select = type
-      switch(type) {
+      switch (type) {
         case 'onLine':
-          this.onLineHover = true;
-          break;
+          this.onLineHover = true
+          break
         case 'volunteer':
-          this.volunteerHover = true;
-          break;
+          this.volunteerHover = true
+          break
         case 'satisfaction':
-          this.satisfactionHover = true;
-          break;
+          this.satisfactionHover = true
+          break
       }
     },
-    mouseLeave(type){
+    mouseLeave (type) {
       this.select = ''
-      switch(type) {
+      switch (type) {
         case 'onLine':
-          this.onLineHover = false;
-          break;
+          this.onLineHover = false
+          break
         case 'volunteer':
-          this.volunteerHover = false;
-          break;
+          this.volunteerHover = false
+          break
         case 'satisfaction':
-          this.satisfactionHover = false;
-          break;
+          this.satisfactionHover = false
+          break
       }
-    },
+    }
   },
-  //生命周期 - 创建完成(可以访问当前this实例)
-  created() {},
-  //生命周期 - 挂载完成(可以访问DOM元素)
-  mounted() {},
-  beforeCreate() {}, //生命周期 - 创建之前
-  beforeMount() {}, //生命周期 - 挂载之前
-  beforeUpdate() {}, //生命周期 - 更新之前
-  updated() {}, //生命周期 - 更新之后
-  beforeDestroy() {}, //生命周期 - 销毁之前
-  destroyed() {}, //生命周期 - 销毁完成
-  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
-};
+  // 生命周期 - 创建完成(可以访问当前this实例)
+  created () {},
+  // 生命周期 - 挂载完成(可以访问DOM元素)
+  mounted () {},
+  beforeCreate () {}, // 生命周期 - 创建之前
+  beforeMount () {}, // 生命周期 - 挂载之前
+  beforeUpdate () {}, // 生命周期 - 更新之前
+  updated () {}, // 生命周期 - 更新之后
+  beforeDestroy () {}, // 生命周期 - 销毁之前
+  destroyed () {}, // 生命周期 - 销毁完成
+  activated () {} // 如果页面有keep-alive缓存功能,这个函数会触发
+}
 </script>
 <style lang='less' scoped>
 .survey {

+ 2 - 2
src/pages/collection/collection-detail.vue

@@ -215,7 +215,7 @@ export default {
             width: 85%;
             margin: 94px auto 0;
             .nav-con-title {
-              background: #a01c26ff;
+              background: #945335;
               padding: 14.5px 0 14.5px 46px;
               font-size: 20px;
               font-family: Microsoft YaHei;
@@ -225,7 +225,7 @@ export default {
             }
             .nav-con-type {
               margin-top: 3px;
-              background: rgba(160, 28, 38, 0.6);
+              background: rgba(148, 83, 53, .6);
               overflow: hidden;
               > ul {
                 width: 100%;

+ 7 - 7
src/pages/collection/collection-type.vue

@@ -293,7 +293,7 @@ export default {
             width: 85%;
             margin: 94px auto 0;
             .nav-con-title {
-              background: #a01c26ff;
+              background: #945335;
               padding: 14.5px 0 14.5px 46px;
               font-size: 20px;
               font-family: Microsoft YaHei;
@@ -303,7 +303,7 @@ export default {
             }
             .nav-con-type {
               margin-top: 3px;
-              background: rgba(160, 28, 38, 0.6);
+              background: rgba(148, 83, 53, .6);
               overflow: hidden;
               > ul {
                 width: 100%;
@@ -379,8 +379,8 @@ export default {
                 height: 100%;
                 padding-left: 16px;
                 color: #ffffff;
-                border: rgba(160, 28, 38, 0.4);
-                background: rgba(160, 28, 38, 0.4);
+                border: rgba(148, 83, 53, 0.4);
+                background: rgba(148, 83, 53, 0.4);
                 &::placeholder {
                   font-size: 16px;
                   font-family: Microsoft YaHei;
@@ -396,8 +396,8 @@ export default {
               > button {
                 width: 100%;
                 height: 100%;
-                border: rgba(160, 28, 38, 1);
-                background: rgba(160, 28, 38, 1);
+                border: #945335;
+                background: #945335;
                 border-radius: 0 5px 5px 0;
                 font-size: 16px;
                 font-family: Microsoft YaHei;
@@ -446,7 +446,7 @@ export default {
               .cover {
                 width: 100%;
                 height: 100%;
-                background: rgba(160, 28, 38, 0.8);
+                background: rgba(148, 83, 53, 0.8);
                 box-shadow: 0 0 15px rgba(0, 0, 0, 1);
                 position: absolute;
                 top: 0;

+ 3 - 3
src/pages/exhibition/exhibition-detail.vue

@@ -161,7 +161,7 @@ export default {
       position: relative;
       .btn {
         position: absolute;
-        background: rgba(160, 28, 38, 1);
+        background: #945335;
         box-shadow: 0 0 6px rgba(255, 255, 255, 1);
         text-align: center;
         line-height: 55px;
@@ -202,7 +202,7 @@ export default {
             width: 85%;
             margin: 94px auto 0;
             .nav-con-title {
-              background: #a01c26ff;
+              background: #945335;
               padding: 14.5px 0 14.5px 46px;
               font-size: 20px;
               font-family: Microsoft YaHei;
@@ -212,7 +212,7 @@ export default {
             }
             .nav-con-type {
               margin-top: 3px;
-              background: rgba(160, 28, 38, 0.6);
+              background: rgba(148, 83, 53, .6);
               overflow: hidden;
               > ul {
                 width: 100%;

+ 4 - 4
src/pages/exhibition/exhibition-type.vue

@@ -233,7 +233,7 @@ export default {
       position: relative;
       .btn {
         position: absolute;
-        background: rgba(160, 28, 38, 1);
+        background: #945335;
         box-shadow: 0 0 6px rgba(255, 255, 255, 1);
         text-align: center;
         line-height: 55px;
@@ -274,7 +274,7 @@ export default {
             width: 85%;
             margin: 94px auto 0;
             .nav-con-title {
-              background: #a01c26ff;
+              background: #945335;
               padding: 14.5px 0 14.5px 46px;
               font-size: 20px;
               font-family: Microsoft YaHei;
@@ -284,7 +284,7 @@ export default {
             }
             .nav-con-type {
               margin-top: 3px;
-              background: rgba(160, 28, 38, 0.6);
+              background: rgba(148, 83, 53, .6);
               overflow: hidden;
               > ul {
                 width: 100%;
@@ -361,7 +361,7 @@ export default {
               .cover {
                 width: 100%;
                 height: 100%;
-                background: rgba(160, 28, 38, 0.8);
+                background: rgba(148, 83, 53, 0.8);
                 box-shadow: 0 0 15px rgba(0, 0, 0, 1);
                 position: absolute;
                 top: 0;

+ 2 - 2
src/pages/information/information-detail.vue

@@ -199,7 +199,7 @@ export default {
             width: 85%;
             margin: 94px auto 0;
             .nav-con-title {
-              background: #a01c26ff;
+              background: #945335;
               padding: 14.5px 0 14.5px 46px;
               font-size: 20px;
               font-family: Microsoft YaHei;
@@ -209,7 +209,7 @@ export default {
             }
             .nav-con-type {
               margin-top: 3px;
-              background: rgba(160, 28, 38, 0.6);
+              background: rgba(148, 83, 53, .6);
               overflow: hidden;
               > ul {
                 width: 100%;

+ 2 - 2
src/pages/information/information-type.vue

@@ -275,7 +275,7 @@ export default {
             width: 85%;
             margin: 94px auto 0;
             .nav-con-title {
-              background: #a01c26ff;
+              background: #945335;
               padding: 14.5px 0 14.5px 46px;
               font-size: 20px;
               font-family: Microsoft YaHei;
@@ -285,7 +285,7 @@ export default {
             }
             .nav-con-type {
               margin-top: 3px;
-              background: rgba(160, 28, 38, 0.6);
+              background: rgba(148, 83, 53, .6);
               overflow: hidden;
               > ul {
                 width: 100%;

+ 1 - 1
src/pages/layout/footer.vue

@@ -70,7 +70,7 @@ export default {
 <style lang="less" scoped>
 .footer {
   width: 100%;
-  background: #232323ff;
+  background: #48372f;
   overflow: hidden;
 
   .con {

+ 20 - 24
src/pages/layout/header.vue

@@ -2,9 +2,7 @@
   <div class="header">
     <div
       class="nav"
-      :style="{
-        backgroundImage: `url('${require('@/assets/images/header-bg.png')}')`,
-      }"
+      style="background-color: #fff;"
     >
       <ul>
         <div class="logo"><img :src="require('@/assets/images/nav-logo.png')" alt="" /></div>
@@ -26,39 +24,37 @@
   </div>
 </template>
 
-
-
 <script>
 export default {
-  name: "mheader",
-  data() {
+  name: 'mheader',
+  data () {
     return {
-      type: "home",
-      allType:['home','survey','information','exhibition','collection','activity','service']
-    };
+      type: 'home',
+      allType: ['home', 'survey', 'information', 'exhibition', 'collection', 'activity', 'service']
+    }
   },
   methods: {
-    navigation(type) {
-      this.type = type;
-      this.$router.push({ path: `/${type}` });
-    },
+    navigation (type) {
+      this.type = type
+      this.$router.push({ path: `/${type}` })
+    }
   },
-  watch:{
-    $route(to,from){
+  watch: {
+    $route (to, from) {
       // console.log('从哪来',from.path);//从哪来
       // console.log('到哪去',to.path);//到哪去
-      this.allType.forEach(item=>{
-        if(to.path.indexOf(item) != -1) this.type = item;
+      this.allType.forEach(item => {
+        if (to.path.indexOf(item) != -1) this.type = item
       })
     }
   },
-  created() {
+  created () {
     // 页面刷新时候
-    this.allType.forEach(item=>{
-      if(window.location.href.split('?')[0].indexOf(item) != -1) this.type = item;
+    this.allType.forEach(item => {
+      if (window.location.href.split('?')[0].indexOf(item) != -1) this.type = item
     })
   }
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -87,7 +83,7 @@ export default {
           font-family: Microsoft YaHei;
           font-weight: bold;
           line-height: 21px;
-          color: #ffffff;
+          color: black;
           letter-spacing: 2px;
           opacity: 0.7;
         }
@@ -103,7 +99,7 @@ export default {
         }
       }
       .cur {
-        background: rgba(165, 29, 41,.5);
+        background: rgba(148, 83, 53, .6);
         a {
           color: #FFFFFF;
           opacity: 1;

+ 3 - 3
src/pages/service/service-detail.vue

@@ -285,7 +285,7 @@ export default {
             width: 85%;
             margin: 94px auto 0;
             .nav-con-title {
-              background: #a01c26ff;
+              background: #945335;
               padding: 14.5px 0 14.5px 46px;
               font-size: 20px;
               font-family: Microsoft YaHei;
@@ -295,7 +295,7 @@ export default {
             }
             .nav-con-type {
               margin-top: 3px;
-              background: rgba(160, 28, 38, 0.6);
+              background: rgba(148, 83, 53, .6);
               overflow: hidden;
               > ul {
                 width: 100%;
@@ -452,7 +452,7 @@ export default {
                     .content-bottom-btn {
                       width: 108px;
                       height: 31px;
-                      background: #a01c26;
+                      background: #945335;
                       line-height: 31px;
                       text-align: center;
                       font-size: 14px;

+ 3 - 3
src/pages/survey/survey-type.vue

@@ -189,7 +189,7 @@ export default {
             width: 85%;
             margin: 94px auto 0;
             .nav-con-title {
-              background: #a01c26ff;
+              background: #945335;
               padding: 14.5px 0 14.5px 46px;
               font-size: 20px;
               font-family: Microsoft YaHei;
@@ -200,7 +200,7 @@ export default {
             }
             .nav-con-type {
               margin-top: 3px;
-              background: rgba(160, 28, 38, 0.6);
+              background: rgba(148, 83, 53, .6);
               overflow: hidden;
               > ul {
                 width: 100%;
@@ -293,7 +293,7 @@ export default {
               display: inline-block;
               width: 8px;
               height: 20px;
-              background: rgba(160, 28, 38, 1);
+              background: #945335;
               vertical-align: middle;
               margin-right: 10px;
             }

+ 3 - 3
src/pages/survey/survey.vue

@@ -20,7 +20,7 @@
             "
             alt=""
           />
-          <div class="txt" :class="{ active: select==='introduction' }">本馆介绍</div>
+          <div class="txt" :class="{ active: select==='introduction' }"></div>
         </li>
         <li
           @click="toType('history')"
@@ -35,7 +35,7 @@
             "
             alt=""
           />
-          <div class="txt" :class="{ active: select==='history' }">历史沿革</div>
+          <div class="txt" :class="{ active: select==='history' }"></div>
         </li>
         <li
           @click="toType('mechanism')"
@@ -50,7 +50,7 @@
             "
             alt=""
           />
-          <div class="txt" :class="{ active: select==='mechanism' }">机构职能</div>
+          <div class="txt" :class="{ active: select==='mechanism' }"></div>
         </li>
       </ul>
     </div>