Explorar el Código

更新v4場景版本

tremble hace 3 años
padre
commit
238a51acd7
Se han modificado 6 ficheros con 41 adiciones y 4 borrados
  1. 1 0
      .env
  2. 1 0
      .env.prod
  3. 4 0
      public/showMobile.html
  4. 11 3
      src/framework/showMobile/iframe.vue
  5. 13 0
      src/framework/showMobile/v4_page/index.vue
  6. 11 1
      vue.config.js

+ 1 - 0
.env

@@ -3,4 +3,5 @@ VUE_APP_STATIC_DIR=static
 VUE_APP_INNERNET=https://fcb.intranet.4dkankan.com
 VUE_APP_CDN=https://4dkk.4dage.com
 VUE_APP_PROXY_URL='http://www.4dkankan.com/qjkankan/'
+VUE_APP_PROXY_4DKANKAN_URL='http://www.4dkankan.com/'
 VUE_APP_URL_FILL=/qjkankan

+ 1 - 0
.env.prod

@@ -3,4 +3,5 @@ VUE_APP_STATIC_DIR=static
 VUE_APP_INNERNET=https://fcb.intranet.4dkankan.com
 VUE_APP_CDN=https://4dkk.4dage.com
 VUE_APP_PROXY_URL='http://www.4dkankan.com/qjkankan/'
+VUE_APP_PROXY_4DKANKAN_URL='http://www.4dkankan.com/'
 VUE_APP_URL_FILL=/qjkankan

+ 4 - 0
public/showMobile.html

@@ -33,6 +33,10 @@
     <!-- built files will be auto injected -->
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/jquery-2.1.1.min.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/lib/krpano/js/tour.js"></script>
+    
+    <script src="https://4dkk.4dage.com/v4/www/sdk/kankan-sdk-deps.js?v=4.0.0-alpha.44"></script>
+    <script src="https://4dkk.4dage.com/v4/www/sdk/kankan-sdk.js?v=4.0.0-alpha.44"></script>
+
     <script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
 
 <!-- 

+ 11 - 3
src/framework/showMobile/iframe.vue

@@ -1,17 +1,19 @@
 <template>
   <div class="ifrcon">
     <Header :bgmUrl="tempBgm" @toggleBGM="handleBGM" :somedatainfo="somedatainfo" :bgmstatus="bgmstatus" :params="params" />
-    <iframe allowfullscreen="true" ref="iframe" id="showifr" :src="url" frameborder="0" @load="onIframLoad"></iframe>
+    <iframe v-if="!isV4" allowfullscreen="true" ref="iframe" id="showifr" :src="url" frameborder="0" @load="onIframLoad"></iframe>
+    <v4_page :somedatainfo="somedatainfo" v-else/>
   </div>
 </template>
 
 <script>
 import Header from "./ui/Show.Header";
 import browser from "@/utils/browser"
+import v4_page from "./v4_page/index.vue";
 
 export default {
   props:['url','bgmUrl','somedatainfo'],
-  components:{Header},
+  components:{Header,v4_page},
   data(){
     return {
       params:'',
@@ -21,6 +23,9 @@ export default {
   computed:{
     tempBgm(){
       return this.bgmUrl
+    },
+    isV4(){
+      return this.somedatainfo.isUpgrade
     }
   },
   methods:{
@@ -89,7 +94,10 @@ export default {
             }
         },"*")
     }
-  }
+  },
+  mounted() {
+    console.log(this.somedatainfo)
+  },
 }
 </script>
 

+ 13 - 0
src/framework/showMobile/v4_page/index.vue

@@ -0,0 +1,13 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

+ 11 - 1
vue.config.js

@@ -1,5 +1,6 @@
 // const proxy_url = process.env.VUE_APP_PROXY_URL || 'http://8.135.98.231:8084'
 const proxy_url = process.env.VUE_APP_PROXY_URL || 'https://fcb.test.4dkankan.com'
+const proxy_4dkankan_url = process.env.VUE_APP_PROXY_4DKANKAN_URL || 'https://fcb.test.4dkankan.com'
 // https://vr-web01-uat.fcb.com.cn/
 let pages = {
   edit: 'src/pages/edit.js',
@@ -37,7 +38,16 @@ module.exports = {
         '/web': {
           target: proxy_url,
           changeOrigin: true,
-        }
+        },
+        '/api': {
+          target: proxy_4dkankan_url,
+          changeOrigin: true,
+        },
+        "/service": {
+          // target: "https://v4-test.4dkankan.com/",
+          target: proxy_4dkankan_url,
+          changeOrigin: true,
+        },
     },
   }
 };