chenlei 2 місяців тому
батько
коміт
c65765ee06

+ 1 - 1
.env.dev

@@ -1,6 +1,6 @@
 VUE_APP_CLI_MODE=dev
 NODE_ENV=development
 PUBLIC_PATH=/
-VUE_APP_SCENE_ORIGIN=https://sit-locbigsecen.4dage.com
+VUE_APP_SCENE_ORIGIN=https://wuxicharitymuseum.cn
 VUE_APP_DEPLOY_ORIGIN=https://sit-wuxicishan.4dage.com
 VUE_APP_ARTICLE_ORIGIN=http://dev.api.museum.b.wxiy.com

+ 1 - 1
.env.mytest

@@ -1,6 +1,6 @@
 VUE_APP_CLI_MODE=test
 NODE_ENV=production
 PUBLIC_PATH=./
-VUE_APP_SCENE_ORIGIN=https://sit-locbigsecen.4dage.com
+VUE_APP_SCENE_ORIGIN=https://wuxicharitymuseum.cn
 VUE_APP_DEPLOY_ORIGIN=https://sit-wuxicishan.4dage.com
 VUE_APP_ARTICLE_ORIGIN=https://api.museum.b.wxiy.com

+ 1 - 1
.env.prod

@@ -1,6 +1,6 @@
 VUE_APP_CLI_MODE=prod
 NODE_ENV=production
 PUBLIC_PATH=./
-VUE_APP_SCENE_ORIGIN=https://sit-locbigsecen.4dage.com
+VUE_APP_SCENE_ORIGIN=https://wuxicharitymuseum.cn
 VUE_APP_DEPLOY_ORIGIN=https://wuxicharitymuseum.cn
 VUE_APP_ARTICLE_ORIGIN=https://api.museum.b.wxiy.com

+ 2 - 2
README.md

@@ -5,10 +5,10 @@
 访问url:https://wuxicharitymuseum.cn/#/home
 
 ## 微信扫码页面url
-https://open.weixin.qq.com/connect/qrconnect?appid=wx3d4f2e0cfc3b8e54&redirect_uri=https%3A%2F%2Fsit-wuxicishan.4dage.com%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=CityOfXishan#wechat_redirect
+https://open.weixin.qq.com/connect/qrconnect?appid=wxd6467a266a4dfda9&redirect_uri=https%3A%2F%2Fwuxicharitymuseum.cn%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=CityOfXishan#wechat_redirect
 
 ## 对接unity
-/unityForPc/index.html?platform=h5&name={userName}&scene=${sceneCode}
+/pc/index.html?platform=h5&name={userName}&scene=${sceneCode}
 
 ## sceneCode
 * 0: 慈善云学校

+ 6 - 6
public/staticConfig.js

@@ -108,7 +108,7 @@ var staticConfig = {
     {
       id: 1,
       name: "永锡不匮--无锡慈善的传承与创新(善德名邦)",
-      url: `/wxScene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:93,qua:0.0003672651343559632,0.8562585754236621,-0.0006088002902584934,0.5165468991064768`,
+      url: `/bigScene/scene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:93,qua:0.0003672651343559632,0.8562585754236621,-0.0006088002902584934,0.5165468991064768`,
       date: '2024年5月27日至今',
       address: '1号厅',
       type: '基本陈列',
@@ -116,7 +116,7 @@ var staticConfig = {
     {
       id: 2,
       name: "永锡不匮--无锡慈善的传承与创新(善道为公)",
-      url: `/wxScene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:433,qua:0.005444343576967057,0.777935509128107,-0.006741132562691553,0.6282843660430556`,
+      url: `/bigScene/scene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:433,qua:0.005444343576967057,0.777935509128107,-0.006741132562691553,0.6282843660430556`,
       date: '2024年5月27日至今',
       address: '1号厅',
       type: '基本陈列',
@@ -125,7 +125,7 @@ var staticConfig = {
     {
       id: 3,
       name: "永锡不匮--无锡慈善的传承与创新(善者无疆)",
-      url: `/wxScene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:232,qua:-0.00018523724081728223,0.9268546983343686,0.0004573225593805949,0.3754199311652464`,
+      url: `/bigScene/scene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:232,qua:-0.00018523724081728223,0.9268546983343686,0.0004573225593805949,0.3754199311652464`,
       date: '2024年5月27日至今',
       address: '1号厅',
       type: '基本陈列',
@@ -134,7 +134,7 @@ var staticConfig = {
     {
       id: 4,
       name: "文教春秋--荡口慈善文化与教育",
-      url: `/wxScene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:670,qua:0.0010361982917485185,0.9793875839043288,-0.0050258303567850705,0.2019247886434278`,
+      url: `/bigScene/scene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:670,qua:0.0010361982917485185,0.9793875839043288,-0.0050258303567850705,0.2019247886434278`,
       date: '2024年5月27日至今',
       address: '1号厅',
       type: '专题展览',
@@ -143,7 +143,7 @@ var staticConfig = {
     {
       id: 5,
       name: "薪火鸿模--鸿模小学历史文化",
-      url: `/wxScene/index.html?m=wxcs_SG-2e4SwPKzjZz&firstView=pano:16,qua:-0.004615061680190784,-0.05639108346896922,-0.000260665886610734,0.9983980565048178`,
+      url: `/bigScene/scene/index.html?m=wxcs_SG-2e4SwPKzjZz&firstView=pano:16,qua:-0.004615061680190784,-0.05639108346896922,-0.000260665886610734,0.9983980565048178`,
       date: '2024年5月27日至今',
       address: '1号厅',
       type: '专题展览',
@@ -151,7 +151,7 @@ var staticConfig = {
     {
       id: 6,
       name: "慈·善--从手到心的给予",
-      url: `/wxScene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:465,qua:-0.04471889285056369,0.6934088933805184,0.04319590870552653,0.7178568337448256`,
+      url: `/bigScene/scene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:465,qua:-0.04471889285056369,0.6934088933805184,0.04319590870552653,0.7178568337448256`,
       date: '2024年5月27日至今',
       address: '1号厅',
       type: '主题临展'

+ 2 - 2
src/App.vue

@@ -185,7 +185,7 @@ function onClickFeedBack() {
   if (process.env.VUE_APP_CLI_MODE === 'dev' || store.state.loginStatus === store.getters.loginStatusEnum.wxUser) {
     isShowFeedBack.value = true
   } else {
-    location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wx3d4f2e0cfc3b8e54&redirect_uri=https%3A%2F%2Fsit-wuxicishan.4dage.com%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent(route.name)}#wechat_redirect`
+    location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wxd6467a266a4dfda9&redirect_uri=https%3A%2F%2Fwuxicharitymuseum.cn%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent(route.name)}#wechat_redirect`
   }
 }
 
@@ -206,7 +206,7 @@ async function onClickShop() {
         name: 'ShopView'
       })
     } else {
-      location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wx3d4f2e0cfc3b8e54&redirect_uri=https%3A%2F%2Fsit-wuxicishan.4dage.com%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent('ShopView')}#wechat_redirect`
+      location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wxd6467a266a4dfda9&redirect_uri=https%3A%2F%2Fwuxicharitymuseum.cn%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent('ShopView')}#wechat_redirect`
     }
   } finally {
     pageLoading.value = false

+ 1 - 1
src/api.js

@@ -7,7 +7,7 @@ axios.interceptors.response.use(function (response) {
   if (response.data.code === 5001 || response.data.code === 5002) {
     store.commit('logoutCallback')
     // router.push({ name: 'HomeView' })
-    location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wx3d4f2e0cfc3b8e54&redirect_uri=https%3A%2F%2Fsit-wuxicishan.4dage.com%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent(router.currentRoute.value.name)}#wechat_redirect`
+    location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wxd6467a266a4dfda9&redirect_uri=https%3A%2F%2Fwuxicharitymuseum.cn%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent(router.currentRoute.value.name)}#wechat_redirect`
     return Promise.reject('登录态过期')
   }
   return response

+ 1 - 1
src/components/IframeWrap.vue

@@ -35,7 +35,7 @@ onMounted(() => {
     router.go(-1)
   }
   iframeRef.value.contentWindow.goToLogin = () => {
-    location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wx3d4f2e0cfc3b8e54&redirect_uri=https%3A%2F%2Fsit-wuxicishan.4dage.com%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent(route.name)}#wechat_redirect`
+    location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wxd6467a266a4dfda9&redirect_uri=https%3A%2F%2Fwuxicharitymuseum.cn%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent(route.name)}#wechat_redirect`
   }
   iframeRef.value.contentWindow.openWindow = function(url) {
     console.log(`iframe: openWindow(${url})`)

+ 1 - 1
src/components/LoginForm.vue

@@ -91,7 +91,7 @@ async function onClickAsVisitor() {
 }
 
 function onClickLoginWx() {
-  location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wx3d4f2e0cfc3b8e54&redirect_uri=https%3A%2F%2Fsit-wuxicishan.4dage.com%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent(route.name)}#wechat_redirect`
+  location.href = `https://open.weixin.qq.com/connect/qrconnect?appid=wxd6467a266a4dfda9&redirect_uri=https%3A%2F%2Fwuxicharitymuseum.cn%2F%23%2Flogin-temp&response_type=code&scope=snsapi_login&state=${encodeURIComponent(route.name)}#wechat_redirect`
 }
 
 const $isAndroid = inject('$isAndroid')

+ 1 - 1
src/views/CharityHall.vue

@@ -24,7 +24,7 @@ store.dispatch('recordPageVisitIfNeeded', {
   pageId: 5,
 })
 
-const url = ref(`${$env.VUE_APP_DEPLOY_ORIGIN}/unityForPc/index.html?platform=h5&name=${store.state.userInfo.userName}&scene=1`)
+const url = ref(`${$env.VUE_APP_DEPLOY_ORIGIN}/pc/index.html?platform=h5&name=${store.state.userInfo.userName}&scene=1`)
 </script>
 
 <style lang="less" scoped>

+ 1 - 1
src/views/CityOfXishan.vue

@@ -45,7 +45,7 @@ store.dispatch('recordPageVisitIfNeeded', {
 })
 
 const url = computed(() => {
-  let temp = `${$env.VUE_APP_DEPLOY_ORIGIN}/${$isTablet ? 'unityForPad' : 'unityForPc'}/index.html?platform=${$isTablet ? 'pad' : 'h5'}&name=${encodeURIComponent(store.state.userInfo.userName)}`
+  let temp = `${$env.VUE_APP_DEPLOY_ORIGIN}/${$isTablet ? 'unityForPad' : 'pc'}/index.html?platform=${$isTablet ? 'pad' : 'h5'}&name=${encodeURIComponent(store.state.userInfo.userName)}`
   if (route.query.scene !== undefined) {
     temp += `&scene=${route.query.scene}`
   }

+ 1 - 1
src/views/CloudSchool.vue

@@ -24,7 +24,7 @@ store.dispatch('recordPageVisitIfNeeded', {
   pageId: 7,
 })
 
-const url = ref(`${$env.VUE_APP_DEPLOY_ORIGIN}/unityForPc/index.html?platform=h5&name=${store.state.userInfo.userName}&scene=0`)
+const url = ref(`${$env.VUE_APP_DEPLOY_ORIGIN}/pc/index.html?platform=h5&name=${store.state.userInfo.userName}&scene=0`)
 
 </script>
 

+ 1 - 1
src/views/LoveForest.vue

@@ -24,7 +24,7 @@ store.dispatch('recordPageVisitIfNeeded', {
   pageId: 6,
 })
 
-const url = ref(`${$env.VUE_APP_DEPLOY_ORIGIN}/unityForPc/index.html?platform=h5&name=${store.state.userInfo.userName}&scene=3`)
+const url = ref(`${$env.VUE_APP_DEPLOY_ORIGIN}/pc/index.html?platform=h5&name=${store.state.userInfo.userName}&scene=3`)
 
 </script>
 

Різницю між файлами не показано, бо вона завелика
+ 3 - 3
src/views/MuseumView.vue


+ 4 - 4
src/views/MuseumView/MuseumView.vue

@@ -65,7 +65,7 @@ const LIST = [
     subLabel: '无锡慈善的传承与创新',
     tag: '查看详情',
     tagType: 'blue',
-    url: process.env.VUE_APP_SCENE_ORIGIN + '/wxScene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:93,qua:0.0003672651343559632,0.8562585754236621,-0.0006088002902584934,0.5165468991064768'
+    url: process.env.VUE_APP_SCENE_ORIGIN + '/bigScene/scene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:93,qua:0.0003672651343559632,0.8562585754236621,-0.0006088002902584934,0.5165468991064768'
   },
   {
     img: Img2,
@@ -73,7 +73,7 @@ const LIST = [
     subLabel: '鸿模小学历史文化',
     tag: '专题展览',
     tagType: 'yellow',
-    url: process.env.VUE_APP_SCENE_ORIGIN + '/wxScene/index.html?m=wxcs_SG-2e4SwPKzjZz&firstView=pano:58,qua:0.009673258554985372,0.7225085922444167,-0.01011112114389994,0.691220327881049'
+    url: process.env.VUE_APP_SCENE_ORIGIN + '/bigScene/scene/index.html?m=wxcs_SG-2e4SwPKzjZz&firstView=pano:58,qua:0.009673258554985372,0.7225085922444167,-0.01011112114389994,0.691220327881049'
   },
   {
     img: Img1,
@@ -81,7 +81,7 @@ const LIST = [
     subLabel: '荡口慈善文化与教育',
     tag: '专题展览',
     tagType: 'yellow',
-    url: process.env.VUE_APP_SCENE_ORIGIN + '/wxScene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:670,qua:0.0010361982917485185,0.9793875839043288,-0.0050258303567850705,0.2019247886434278'
+    url: process.env.VUE_APP_SCENE_ORIGIN + '/bigScene/scene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:670,qua:0.0010361982917485185,0.9793875839043288,-0.0050258303567850705,0.2019247886434278'
   },
   {
     img: Img2,
@@ -89,7 +89,7 @@ const LIST = [
     subLabel: '从手到心的给予',
     tag: '主题临展',
     tagType: 'blue',
-    url: process.env.VUE_APP_SCENE_ORIGIN + '/wxScene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:465,qua:-0.04471889285056369,0.6934088933805184,0.04319590870552653,0.7178568337448256'
+    url: process.env.VUE_APP_SCENE_ORIGIN + '/bigScene/scene/index.html?m=wxcs_SG-fwjuL9mtG2A&firstView=pano:465,qua:-0.04471889285056369,0.6934088933805184,0.04319590870552653,0.7178568337448256'
   },
 ]
 

+ 1 - 1
src/views/SquareView.vue

@@ -24,7 +24,7 @@ store.dispatch('recordPageVisitIfNeeded', {
   pageId: 3,
 })
 
-const url = ref(`${$env.VUE_APP_DEPLOY_ORIGIN}/unityForPc/index.html?platform=h5&name=${store.state.userInfo.userName}&scene=2`)
+const url = ref(`${$env.VUE_APP_DEPLOY_ORIGIN}/pc/index.html?platform=h5&name=${store.state.userInfo.userName}&scene=2`)
 
 </script>
 

+ 8 - 0
vue.config.js

@@ -11,6 +11,14 @@ module.exports = defineConfig({
   publicPath: process.env.PUBLIC_PATH,
   productionSourceMap: process.env.VUE_APP_CLI_MODE === 'prod' ? false : true,
   // transpileDependencies: true, // 默认false,表示babel-loader 会忽略所有 node_modules 中的文件
+  devServer: {
+    proxy: {
+      '/api': {
+        target: process.env.VUE_APP_DEPLOY_ORIGIN,
+        changeOrigin: true
+      }
+    }
+  },
   configureWebpack: {
     module: {
       rules: [