新增H5

src/App.vue

@@ -16,13 +16,20 @@ const showTabBar = computed(() => {
 
 // 从store获取isFrom值
 const isFrom = computed(() => store.getters.getIsFrom)
-
 // 组件挂载时从URL参数获取isFrom并存储到store
 onMounted(() => {
-  const queryString = window.location.search
-  const urlParams = new URLSearchParams(queryString)
-  const isFromParam = urlParams.get('isFrom')
-  store.dispatch('setIsFrom', isFromParam)
+  const hash = window.location.hash
+  // 从hash中提取查询参数部分
+  const queryIndex = hash.indexOf('?')
+  if (queryIndex !== -1) {
+    const queryString = hash.substring(queryIndex + 1)
+    const urlParams = new URLSearchParams(queryString)
+    const isFromParam = urlParams.get('isFrom')
+    store.dispatch('setIsFrom', isFromParam)
+  } else {
+    console.log('No query parameters found', 9999)
+    store.dispatch('setIsFrom', null)
+  }
 })
 </script>
 

src/api/index.js

@@ -1,109 +1,6 @@
 import request from '@/utils/request'
-
-// 博物馆相关接口
-export const museumApi = {
-  // 获取轮播图列表
-  getCarouselList(params = {}) {
-    return request({
-      url: '/museum/carousel/page',
-      method: 'get',
-      params: {
-        pageNum: 1,
-        pageSize: 10,
-        status: 1,
-        ...params,
-      },
-    })
-  },
-
-  // 获取展览列表
-  getExhibitionList(params = {}) {
-    return request({
-      url: '/museum/exhibition/page',
-      method: 'get',
-      params: {
-        pageNum: 1,
-        pageSize: 10,
-        status: 1,
-        ...params,
-      },
-    })
-  },
-
-  // 获取展览详情
-  getExhibitionDetail(id) {
-    return request({
-      url: `/museum/exhibition/${id}`,
-      method: 'get',
-    })
-  },
-
-  // 获取典藏列表
-  getCollectionList(params = {}) {
-    return request({
-      url: '/museum/collection/page',
-      method: 'get',
-      params: {
-        pageNum: 1,
-        pageSize: 10,
-        status: 1,
-        ...params,
-      },
-    })
-  },
-
-  // 获取典藏详情
-  getCollectionDetail(id) {
-    return request({
-      url: `/museum/collection/${id}`,
-      method: 'get',
-    })
-  },
-
-  // 获取新闻资讯列表
-  getNewsList(params = {}) {
-    return request({
-      url: '/museum/news/page',
-      method: 'get',
-      params: {
-        pageNum: 1,
-        pageSize: 10,
-        status: 1,
-        ...params,
-      },
-    })
-  },
-
-  // 获取新闻详情
-  getNewsDetail(id) {
-    return request({
-      url: `/museum/news/${id}`,
-      method: 'get',
-    })
-  },
-
-  // 获取活动列表
-  getActivityList(params = {}) {
-    return request({
-      url: '/museum/activity/page',
-      method: 'get',
-      params: {
-        pageNum: 1,
-        pageSize: 10,
-        status: 1,
-        ...params,
-      },
-    })
-  },
-
-  // 获取活动详情
-  getActivityDetail(id) {
-    return request({
-      url: `/museum/activity/${id}`,
-      method: 'get',
-    })
-  },
-}
+import museumApi from './indexPage.js'
+import userApi from './user.js'
 
 // 预约相关接口（需要token）
 export const reservationApi = {
@@ -147,44 +44,6 @@ export const reservationApi = {
   },
 }
 
-// 用户相关接口（需要token）
-export const userApi = {
-  // 获取用户信息
-  getUserInfo() {
-    return request({
-      url: '/user/info',
-      method: 'get',
-    })
-  },
-
-  // 更新用户信息
-  updateUserInfo(data) {
-    return request({
-      url: '/user/update',
-      method: 'post',
-      data,
-    })
-  },
-
-  // 用户登录
-  login(data) {
-    return request({
-      url: '/user/login',
-      method: 'post',
-      data,
-    })
-  },
-
-  // 微信登录
-  weixinLogin(data) {
-    return request({
-      url: '/user/weixin/login',
-      method: 'post',
-      data,
-    })
-  },
-}
-
 // 活动报名相关接口（需要token）
 export const activityApi = {
   // 报名活动
@@ -251,6 +110,8 @@ export const favoriteApi = {
 }
 
 // 导出所有API
+export { museumApi, userApi }
+
 export default {
   museumApi,
   reservationApi,

src/api/indexPage.js

@@ -0,0 +1,154 @@
+import request from '@/utils/request'
+const museumApi = {
+  // 获取轮播图列表
+  getCarouselList(params = {}) {
+    return request({
+      url: '/museum/carousel/page',
+      method: 'post',
+      data: {
+        pageNum: 1,
+        pageSize: 10,
+        status: 1,
+        ...params,
+      },
+    })
+  },
+
+  // 获取资讯列表
+  getNewsList(params = {}) {
+    return request({
+      url: '/museum/information/page',
+      method: 'post',
+      data: {
+        pageNum: 1,
+        pageSize: 3,
+        status: 1,
+        ...params,
+      },
+    })
+  },
+
+  // 获取展览列表
+  getExhibitionList(params = {}) {
+    return request({
+      url: '/museum/exhibit/page',
+      method: 'post',
+      data: {
+        pageNum: 1,
+        pageSize: 5,
+        status: 1,
+        ...params,
+      },
+    })
+  },
+
+  // 社教活动列表
+  getSocialActivityList(params = {}) {
+    return request({
+      url: '/museum/activity/page',
+      method: 'post',
+      data: {
+        pageNum: 1,
+        pageSize: 5,
+        ...params,
+      },
+    })
+  },
+
+  // 获取展览详情
+  getExhibitionDetail(id) {
+    return request({
+      url: `/museum/exhibition/${id}`,
+      method: 'get',
+    })
+  },
+
+  // 获取展览详情（新接口）
+  getExhibitDetail(id) {
+    return request({
+      url: `/museum/exhibit/info/${id}`,
+      method: 'post',
+    })
+  },
+
+  // 获取典藏列表
+  getCollectionList(params = {}) {
+    return request({
+      url: '/museum/collection/page',
+      method: 'get',
+      params: {
+        pageNum: 1,
+        pageSize: 10,
+        status: 1,
+        ...params,
+      },
+    })
+  },
+
+  // 获取文物列表
+  getArtifactList(params = {}) {
+    return request({
+      url: '/museum/artifact/page',
+      method: 'post',
+      data: {
+        pageNum: 1,
+        pageSize: 10,
+        status: 1,
+        title: '',
+        type: 0,
+        ...params,
+      },
+    })
+  },
+
+  // 获取典藏详情
+  getCollectionDetail(id) {
+    return request({
+      url: `/museum/collection/${id}`,
+      method: 'get',
+    })
+  },
+
+  // 获取文物详情
+  getArtifactDetail(id) {
+    return request({
+      url: `/museum/artifact/info/${id}`,
+      method: 'post',
+    })
+  },
+
+  // 获取新闻详情
+  getNewsDetail(id) {
+    return request({
+      url: `/museum/news/${id}`,
+      method: 'get',
+    })
+  },
+
+  // 获取资讯详情
+  getInformationDetail(id) {
+    return request({
+      url: `/museum/information/info/${id}`,
+      method: 'post',
+    })
+  },
+
+  // 获取活动详情
+  getActivityDetail(id) {
+    return request({
+      url: `/museum/activity/info/${id}`,
+      method: 'post',
+    })
+  },
+
+  // 获取展馆介绍详情
+  getMuseumDetail(type) {
+    return request({
+      url: `/museum/introContext/info/${type}`,
+      method: 'post',
+    })
+  },
+}
+
+export { museumApi }
+export default museumApi

src/api/user.js

@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+// 用户相关接口（需要token）
+const userApi = {
+  // 获取用户信息
+  getUserInfo() {
+    return request({
+      url: '/user/info',
+      method: 'get',
+    })
+  },
+
+  // 更新用户信息
+  updateUserInfo(data) {
+    return request({
+      url: '/user/update',
+      method: 'post',
+      data,
+    })
+  },
+
+  // 用户登录
+  login(data) {
+    return request({
+      url: '/user/login',
+      method: 'post',
+      data,
+    })
+  },
+
+  // 微信登录
+  weixinLogin(data) {
+    return request({
+      url: '/user/weixin/login',
+      method: 'post',
+      data,
+    })
+  },
+}
+export { userApi }
+export default userApi

src/assets/main.css

@@ -19,6 +19,9 @@ a,
 .home-tabar {
   height: calc(100vh - 78px) !important;
 }
+.notMargin {
+  margin: 0 !important;
+}
 @media (hover: hover) {
   a:hover {
     background-color: hsla(160, 100%, 37%, 0.2);

src/components/TabBar.vue

@@ -9,9 +9,8 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { computed } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
-import wx from 'weixin-js-sdk'
 
 // 引入图标
 import homeNormal from '@/assets/components/icon_home_normal.png'
@@ -64,16 +63,23 @@ const getIconSrc = (item) => {
 
 // 切换标签
 const switchTab = (path) => {
-  router.push(path)
-  wx.miniProgram.navigateTo({
-    url: '/pages/user/index',
-    success: (res) => {
-      console.log('跳转成功', res)
-    },
-    fail: (err) => {
-      console.log('跳转失败', err)
-    }
-  })
+  // 检测当前URL是否有preview=1参数
+  const isPreviewMode = route.query.preview === '1'
+
+  // 如果是预览模式且要跳转到'我的'页面，则阻止跳转
+  if (isPreviewMode && path === '/user') {
+    return
+  }
+
+  // 如果是预览模式，在跳转时保留preview=1参数
+  if (isPreviewMode) {
+    router.push({
+      path: path,
+      query: { preview: '1' }
+    })
+  } else {
+    router.push(path)
+  }
 }
 </script>