Explorar o código

13届航展封版

tremble %!s(int64=2) %!d(string=hai) anos
pai
achega
114d30ed54

+ 3 - 2
.env.cdn

@@ -1,3 +1,4 @@
 VUE_APP_MAIN_COLOR=''
-VUE_APP_CDN=https://4dairoos.4dkankan.com
-VUE_APP_STATIC_DIR=https://4dairoos.4dkankan.com/code/
+VUE_APP_CDN=https://cshangzhan.4dkankan.com
+VUE_APP_STATIC_DIR=https://cshangzhan.4dkankan.com/thirteen/code/
+VUE_APP_PANO=https://cshangzhan.4dkankan.com/code/

+ 4 - 0
.env.tianyiyun

@@ -0,0 +1,4 @@
+VUE_APP_MAIN_COLOR=''
+VUE_APP_CDN=https://airshow.4dkankan.com
+VUE_APP_STATIC_DIR=https://airshow.4dkankan.com/thirteen/code/
+VUE_APP_PANO=https://airshow.4dkankan.com/code/

+ 2 - 0
package.json

@@ -6,6 +6,8 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "serve-cdn": "vue-cli-service serve --mode cdn",
+    "serve-tianyiyun": "vue-cli-service serve --mode tianyiyun",
+    "build-tianyiyun": "vue-cli-service build --mode tianyiyun",
     "build-cdn": "vue-cli-service build --mode cdn",
     "lint": "vue-cli-service lint"
   },

+ 2 - 2
src/framework/show/fdkk.vue

@@ -4,7 +4,7 @@
       allowfullscreen="true"
       ref="iframe"
       :key="selected.id"
-      :src="`spc.html?m=${selected.id}&from=kankan`"
+      :src="`${fdkk_CDN}/spc.html?m=${selected.id}&from=kankan`"
       frameborder="0"
       @click="handleifrclk"
       @load="onIframLoad"
@@ -19,7 +19,7 @@
             :class="{ active: selected.id == item.id }"
           >
             <div>
-              <img :src="`${fdkk_CDN}/hangzhan/images/images${item.id}/thumbBigImg.jpg`" v-errorimg="`${fdkk_CDN}/hangzhan/images/images${item.id}/result.png`" alt="" />
+              <img :src="`${fdkk_CDN}/images/images${item.id}/thumbBigImg.jpg`" v-errorimg="`${fdkk_CDN}/images/images${item.id}/result.png`" alt="" />
               <rollName
                 :offset="20"
                 :active="selected.id == item.id"

+ 3 - 3
src/framework/show/pano.vue

@@ -12,7 +12,7 @@
             :class="{ active: selected.id == item.id }"
           >
             <div>
-              <img :src="`${g_CDN}resource/panos/${selectExh.id}/tiles/${selectExh.id}__(${item.id}).tiles/thumb.jpg`" alt="" />
+              <img :src="`${pano_CDN}resource/panos/${selectExh.id}/tiles/${selectExh.id}__(${item.id}).tiles/thumb.jpg`" alt="" />
               <rollName
                 :offset="20"
                 :active="selected.id == item.id"
@@ -100,8 +100,8 @@ export default {
           window.removepano("#pano");
           window.embedpano({
             // xml: "%HTMLPATH%/static/template/tour.xml",
-            xml: `${this.g_CDN}resource/panos/${newVal.id}/tour.xml`,
-            swf: `${this.g_CDN}resource/tour.swf`,
+            xml: `${this.pano_CDN}resource/panos/${newVal.id}/tour.xml`,
+            swf: `${this.pano_CDN}resource/tour.swf`,
             target: "pano",
             html5: "auto",
             mobilescale: 1,

+ 2 - 2
src/framework/showMobile/fdkk.vue

@@ -4,7 +4,7 @@
       allowfullscreen="true"
       ref="iframe"
       :key="selected.id"
-      :src="`embed.html?m=${selected.id}&from=kankan`"
+      :src="`${fdkk_CDN}/embed.html?m=${selected.id}&from=kankan`"
       frameborder="0"
       @click="handleifrclk"
     ></iframe>
@@ -18,7 +18,7 @@
             :class="{ active: selected.id == item.id }"
           >
             <div>
-              <img :src="`${fdkk_CDN}/hangzhan/images/images${item.id}/thumbBigImg.jpg`" v-errorimg="`${fdkk_CDN}/hangzhan/images/images${item.id}/result.png`" alt="" />
+              <img :src="`${fdkk_CDN}/images/images${item.id}/thumbBigImg.jpg`" v-errorimg="`${fdkk_CDN}/hangzhan/images/images${item.id}/result.png`" alt="" />
               <rollName
                 :offset="20"
                 :active="selected.id == item.id"

+ 3 - 3
src/framework/showMobile/pano.vue

@@ -11,7 +11,7 @@
             :class="{ active: selected.id == item.id }"
           >
             <div>
-              <img :src="`${g_CDN}resource/panos/${selectExh.id}/tiles/${selectExh.id}__(${item.id}).tiles/thumb.jpg`" alt="" />
+              <img :src="`${pano_CDN}resource/panos/${selectExh.id}/tiles/${selectExh.id}__(${item.id}).tiles/thumb.jpg`" alt="" />
               <rollName
                 :offset="20"
                 :active="selected.id == item.id"
@@ -99,8 +99,8 @@ export default {
           window.removepano("#pano");
           window.embedpano({
             // xml: "%HTMLPATH%/static/template/tour.xml",
-            xml: `${this.g_CDN}resource/panos/${newVal.id}/tour.xml`,
-            swf: `${this.g_CDN}resource/tour.swf`,
+            xml: `${this.pano_CDN}resource/panos/${newVal.id}/tour.xml`,
+            swf: `${this.pano_CDN}resource/tour.swf`,
             target: "pano",
             html5: "auto",
             mobilescale: 1,

+ 2 - 0
src/mixins/index.js

@@ -8,6 +8,7 @@ import errorimg from "./v-errorimg";
 
 let g_CDN = process.env.VUE_APP_STATIC_DIR
 let fdkk_CDN = process.env.VUE_APP_CDN
+let pano_CDN = process.env.VUE_APP_PANO
 
 
 
@@ -17,6 +18,7 @@ Vue.mixin({
     return {
       g_isMobile: browser.mobile,
       g_CDN,
+      pano_CDN,
       fdkk_CDN
     };
   },