Merge branch 'master' of http://face3d.4dage.com:7005/chenzhiguang/guangdongVR_museum into master

code/src/views/home/index.vue

@@ -19,11 +19,13 @@ import { ref, defineEmits, onMounted, watch, computed, nextTick } from "vue";
 import { Loading } from "@/components/UI";
 import { useRouter, useRoute } from "vue-router";
 
+let listType = 'museum'
 
 // 得到子组件的切换列表信息
 
 const mapsRef =ref(null);
 const changeMap =(id)=>{
+  listType = id
   // 把id传给子组件地图
   console.log(mapsRef.value);
   mapsRef.value.changeMap(id)
@@ -44,7 +46,15 @@ emitter.on("handleClick", (data) => {
   if (data.num == " 0") {
     return
   }
-  router.push({name:'homelist',params:{id:data.rowid}})
+  router.push({
+    name: 'homelist',
+    params: {
+      id:data.rowid
+    },
+    query: {
+      type: listType,
+    }
+  })
 });
 
 onMounted(() => {

code/src/views/home/list.vue

@@ -30,7 +30,7 @@ import { useRoute,useRouter } from "vue-router";
 const route = useRoute();
 const router = useRouter();
 
-const currentId = ref('museum')
+const currentId = ref('')
 
 const list = ref([])
 
@@ -63,6 +63,12 @@ watch(currentId, () => {
 })
 
 onMounted(() => {
+  if (route.query.type) {
+    currentId.value = route.query.type
+    router.replace({name: route.name, query: {}})
+  } else {
+    currentId.value = 'museum'
+  }
   getList()
 })
 

code/src/views/home/mobile.vue

@@ -16,11 +16,13 @@ import { ref, defineEmits, onMounted, watch, nextTick } from "vue";
 import { Loading } from "@/components/UI";
 import { useRouter, useRoute } from "vue-router";
 
+let listType = 'museum'
 
 // 得到子组件的切换列表信息
 
 const mapsRef =ref(null);
 const changeMap =(id)=>{
+  listType = id
   // 把id传给子组件地图
   console.log(mapsRef.value);
   mapsRef.value.changeMap(id)
@@ -40,7 +42,15 @@ emitter.on("handleClick", (data) => {
   if (data.num == " 0") {
     return
   }
-  router.push({ name: 'homelist', params: { id: data.rowid } })
+  router.push({
+    name: 'homelist',
+    params: {
+      id:data.rowid
+    },
+    query: {
+      type: listType,
+    }
+  })
 });
 
 onMounted(() => {