Merge branch 'james'

src/pages/index/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="wrapper">
     <div class="bgimg">
+      <div class="title">主办单位：中共珠海市委党史学习教育领导小组办公室中共珠海市委宣传部</div>
       <div class="con">
         <div class="btn" @click="enter">
           <span class="btn-txt">点击进入</span>
@@ -26,13 +27,6 @@ export default {
   computed: {},
   watch: {},
   created() {
-    // this.$showLoading();
-    const that = this;
-    this.$nextTick(() => {
-      document.getElementById("startvideo").addEventListener("canplay", () => {
-        that.$hideLoading();
-      });
-    });
   },
   mounted() {},
   methods: {
@@ -55,16 +49,30 @@ export default {
     height: 100%;
     background: url("../../assets/images/index-bg.png") no-repeat center center;
     background-size: 100% 100%;
+    .title {
+        position: relative;
+        top:42%;
+        width: 30vw;
+        margin:0 auto;
+        font-size: 24px;
+        font-family: Source Han Sans CN;
+        font-weight: bold;
+        line-height: 41px;
+        color: #FCD67B;
+        opacity: 1;
+        text-align: center;
+
+     }
     .con {
       left: 50%;
-      top: 25%;
+      top: 45%;
       width: 20%;
       height: 10%;
       margin-left: -10%;
       position: relative;
       .btn {
         margin: 0 auto;
-        margin-top: 5vw;
+        margin-top: 0vw;
         width: 100%;
         height: 74px;
         line-height: 74px;
@@ -89,12 +97,26 @@ export default {
     .bgimg {
       background: url("../../assets/images/mobile-index-bg.png") no-repeat center center;
       background-size: 100% 100%;
+      .title {
+        position: relative;
+        top:40%;
+        width: 75vw;
+        margin:0 auto;
+        font-size: 14px;
+        font-family: Source Han Sans CN;
+        font-weight: bold;
+        line-height: 20px;
+        color: #FCD67B;
+        opacity: 1;
+        text-align: center;
+
+     }
       .con {
         width: 80%;
         left: 50%;
         top:0;
         margin-left: -40%;
-        margin-top:63%;
+        margin-top:100%;
         .btn {
           background: url(../../assets/images/mobile-btn-bg.png) no-repeat center center;
           background-size: 100% 100%;

src/pages/ruins-detail/index.vue

@@ -99,7 +99,7 @@ export default {
           });
           break;
         case "overLook":
-          if (item.id == "2") {
+          if (item.id == "0") {
             window.alert("该红色展馆暂无VR俯瞰");
             break;
           }
@@ -165,7 +165,7 @@ export default {
     font-family: Source Han Sans CN;
     font-weight: bold;
     line-height: 54px;
-    color: #c20e23;
+    color: #FCD67B;
     opacity: 1;
   }
   .container {
@@ -272,7 +272,7 @@ export default {
             font-family: Source Han Sans CN;
             font-weight: bold;
             line-height: 10vw;
-            color: #fcd67b;
+            color: #FCD67B;
             opacity: 1;
             // margin: 4vw 0;
           }

src/pages/ruins/index.vue

@@ -50,7 +50,7 @@ export default {
     text-align: center;
     font-family: Source Han Sans CN;
     font-weight: bold;
-    color: #9c0012;
+    color: #FCD67B;
     opacity: 1;
     margin-top:5vw;
   }