Parcourir la source

修改环境发布

bill il y a 2 ans
Parent
commit
9696950324
4 fichiers modifiés avec 33 ajouts et 12 suppressions
  1. 1 1
      public/index.html
  2. 20 7
      src/components/Controls/Panel/main-shop.vue
  3. 10 3
      src/store/room.js
  4. 2 1
      vue.config.js

+ 1 - 1
public/index.html

@@ -25,7 +25,7 @@
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/swiper/swiper-bundle.min.js"></script>
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/socket.io.min.js"></script>
         <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/zmjm.min.js"></script>
-        <script src="<%= VUE_APP_STATIC_DIR %>/static/lib/jweixin-1.6.0.js"></script>
+        <script src="<%= BASE_URL %><%= VUE_APP_STATIC_DIR %>/static/lib/jweixin-1.6.0.js"></script>
         <script src="<%= VUE_APP_SDK_DIR %>/kankan-sdk-deps.js?v=4.37.3-alpha.78"></script>
         <script src="<%= VUE_APP_SDK_DIR %>/kankan-sdk.js?v=4.37.3-alpha.78"></script>
         <script>

+ 20 - 7
src/components/Controls/Panel/main-shop.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="panel" :class="{show}">
-    <span class="icon" @click="playing ? pause() : play()">
+    <span class="icon" @click="playing ? pause() : play()" v-if="existsGuide">
       <Icon type="play" />
     </span>
     <span class="icon" @click="showScenes = !showScenes">
       <Icon type="scene" />
     </span>
-    <span class="ctrl" @click="show = !show">
+    <span class="ctrl" :class="{ show }" @click="show = !show">
       <Icon type="arrows@2x" />
     </span>
   </div>
@@ -27,18 +27,23 @@ import { getApp } from '@/app'
 const show = ref(false)
 const app = getApp()
 const playing = ref(false)
+const existsGuide = ref(false)
 const showScenes = ref(false)
 
 app.use('TourPlayer').then(player => {
+  console.log('===>', player)
   player.on('play', ({ partId, frameId }) => (playing.value = true))
   player.on('pause', ({ partId, frameId }) => (playing.value = false))
   player.on('end', () => {
     playing.value = false
-    // 兼容最后一个画面没有进度的问题
-    this.progressPart = 100
   })
 })
 
+// 需要双向绑定时,重新设置数据
+app.TourManager.on('loaded', tours => {
+  existsGuide.value = !!tours.length
+})
+
 const play = async () => {
   const player = await app.TourManager.player
   player.play()
@@ -61,17 +66,21 @@ const pause = async () => {
   background: rgba(0, 0, 0, 0.5);
   border-radius: 0px 24px 24px 0px;
   border: 1px solid rgba(255, 255, 255, 0.1);
-  padding-right: 20px;
+  padding-right: 30px;
   display: flex;
   align-items: center;
   justify-content: space-evenly;
-  width: 110px;
-  transform: translateX(-80px);
+  // width: 110px;
+  transform: translateX(calc(-100% + 30px));
 
 
   &.show {
     transform: translateX(0);
   }
+
+  > .icon {
+    margin: 0 10px;
+  }
 }
 
 .icon {
@@ -90,5 +99,9 @@ const pause = async () => {
   top: 50%;
   transform: translateY(-50%);
   font-size: 12px;
+
+  &.show {
+    transform: translateY(-50%) rotateZ(180deg);
+  }
 }
 </style>

+ 10 - 3
src/store/room.js

@@ -23,15 +23,18 @@ export const changeScene = (scene) => {
   }
 }
 
+
+const shopAxios = axios.create({ baseURL: process.env.NODE_ENV !== 'development' ? 'https://v4-test.4dkankan.com' : '' })
+
 export const initialRoom = async () => {
-  const res = await axios.get('/takelook/roomInfo', { params: { roomId } })
+  const res = await shopAxios.get('/takelook/roomInfo', { params: { roomId } })
   room.value = res.data.data
   console.log(room.value)
 }
 
 export const enterRoom = async () => {
   if (!isLeader) return;
-  await axios.get('/takelook/inOrOutRoom', { params: {
+  await shopAxios.get('/takelook/inOrOutRoom', { params: {
     type: 0,
     role: 'leader',
     roomId
@@ -40,9 +43,13 @@ export const enterRoom = async () => {
 
 export const leaveRoom = async () => {
   if (!isLeader) return;
-  await axios.get('/takelook/inOrOutRoom', { params: {
+  await shopAxios.get('/takelook/inOrOutRoom', { params: {
     type: 1,
     role: 'leader',
     roomId
   } })
 }
+
+if (roomId) {
+  shopAxios.get('/takelook/roomAddView', { params: { roomId } })
+}

+ 2 - 1
vue.config.js

@@ -1,5 +1,6 @@
 const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
+  publicPath: './',
   transpileDependencies: true,
   productionSourceMap: false,
   assetsDir: "viewer",
@@ -22,7 +23,7 @@ module.exports = defineConfig({
         changeOrigin: true,
       },
       "/takelook": {
-        target: 'http://v4-test.4dkankan.com/',
+        target: 'https://v4-test.4dkankan.com',
         changeOrigin: true,
       },
     },