Merge branch 'master' of http://face3d.4dage.com:7005/shaogen1995/YFYC-H5

src/router/index.js

@@ -8,7 +8,7 @@ const routes = [{
     name: 'home',
     component: () => import('../views/Home/index.vue'),
     meta: {
-      myTitle: '徽韵江城'
+      myTitle: '建筑可阅读'
     },
   },
   // 语音讲解
@@ -52,7 +52,7 @@ const routes = [{
     path: '/layout/interact/issue',
     name: 'interactIssue',
     meta: {
-      myTitle: '悦·互动发布'
+      myTitle: '建筑可对话发布'
     },
     component: () => import('../views/Interact/components/InteractIssue.vue')
   },
@@ -169,7 +169,7 @@ const routes = [{
         name: 'interact',
         meta: {
           myInd: 3,
-          myTitle: '悦·互动'
+          myTitle: '建筑可对话'
         },
         component: () => import('../views/Interact/index.vue')
       },

src/views/Construct/index.vue

@@ -36,6 +36,12 @@
     </div>
 
 
+  <!-- 进入景点详情的按钮 -->
+  <div class="toInfo" @click="$router.push('/layout/goods')">
+    <img src="../../assets/img/construct/infoBtn.png" alt="">
+  </div>
+
+
   </div>
 </template>
 
@@ -63,7 +69,7 @@ export default {
       slidesPerView: 1.4,
       spaceBetween: 30,
       centeredSlides: true,
-      initialSlide: 4,
+      initialSlide: 1,
     });
   },
   beforeCreate() { }, //生命周期 - 创建之前
@@ -114,6 +120,16 @@ export default {
       font-size: 14px;
     }
   }
+  .toInfo{
+    position: absolute;
+    bottom: 20px;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 160px;
+    &>img{
+      width: 100%;
+    }
+  }
 
   .search {
     position: absolute;

src/views/Goods/index.vue

@@ -39,7 +39,7 @@
     </div>
     <!-- 中间的8个模块 -->
     <div class="skipBtnBox">
-      <div class="skipRow" v-for="item in skipData" :key="item.id" @click="$router.push(item.path)">
+      <div class="skipRow" v-for="item in skipData" :key="item.id" @click="toPage(item.path)">
         <img :src="require(`@/assets/img/goods/skip${item.id}.png`)" alt="">
         <p>{{ item.name }}</p>
       </div>
@@ -102,6 +102,8 @@
 </template>
 
 <script>
+import { Toast } from 'vant'
+
 import { ImagePreview } from 'vant';
 export default {
   name: 'Goods',
@@ -112,11 +114,12 @@ export default {
         { id: 1, name: '语音导览', path: '/goods/audio' },
         { id: 2, name: 'VR场景', path: '/goods/kankan' },
         { id: 3, name: '鸟瞰全景', path: '/goods/vr' },
-        { id: 4, name: '景点导航', path: '/goods/map' },
-        { id: 5, name: '美食', path: '' },
-        { id: 6, name: '酒店住宿', path: '' },
-        { id: 7, name: '预约', path: '' },
-        { id: 8, name: '游玩指引', path: '/goods/play' },
+        { id: 4, name: '文献资料', path: '' },
+        // { id: 4, name: '景点导航', path: '/goods/map' },
+        // { id: 5, name: '美食', path: '' },
+        // { id: 6, name: '酒店住宿', path: '' },
+        // { id: 7, name: '预约', path: '' },
+        // { id: 8, name: '游玩指引', path: '/goods/play' },
       ],
       videoPlay: false
     };
@@ -124,6 +127,11 @@ export default {
   computed: {},
   watch: {},
   methods: {
+    toPage(path){
+      if(!path) return Toast('敬请期待!');
+      this.$router.push(item.path)
+    },
+
     videoPlayFu() {
       this.videoPlay = true
       let dom = document.querySelector('video')

src/views/Layout/index.vue

@@ -21,9 +21,9 @@ export default {
   data() {
     return {
       data: [
-        { id: 1, path: '/layout/construct', name: '览·古建' },
-        { id: 2, path: '/layout/serve', name: '享·服务' },
-        { id: 3, path: '/layout/interact', name: '悦·互动' },
+        { id: 1, path: '/layout/construct', name: '建筑可阅读' },
+        { id: 2, path: '/layout/serve', name: '建筑可游玩' },
+        { id: 3, path: '/layout/interact', name: '建筑可对话' },
         { id: 4, path: '/layout/my', name: '我的' },
       ]
     };
@@ -73,7 +73,7 @@ export default {
       }
       &>p{
         margin-top: 5px;
-        font-size: 14px;
+        font-size: 12px;
       }
     }