Skip to content

yanghanwen / wanda-vr

Go to a project
Commit 1b87d2d2 by 杨翰文
Options

fix: 修改细节

parent 2e6170dc
Showing with 171 additions and 29 deletions
alioss.json
......@@ -18,7 +18,7 @@
"./font/**/*",
"./images/**/*", "./libs/**/*", "./panos/**/*", "./plugins/**/*"],
"dest": "/danzhai-holiday-test/",
"dest": "/danzhai-holiday-test/v5/",
"parallel": 10,
......
index.html
......@@ -47,7 +47,7 @@
.mtitle {
position: absolute;
width: 5.84rem;
bottom: 2.24rem;
bottom: 2.44rem;
left: 50%;
transform: translateX(-50%);
}
......
libs/swiper3d/src/css/3dSwiper.css
......@@ -64,9 +64,9 @@
width: auto;
top: 0;
}
.swiper-wrap li:nth-child(1) {
/* .swiper-wrap li:nth-child(1) {
position: relative;
}
} */
.swiper-wrap.transition li {
transition: .5s;
}
......
route.html
......@@ -661,6 +661,9 @@ function canvasTextAutoLine(str, ctx, canvasWidth, initX, initY, lineHeight, fon
ctx.font = (bold ? 'bold ' : '') + `${fz}px "微软雅黑"`;
ctx.fillStyle = "#fff";
ctx.shadowColor = "rgba(0,0,0,0.8)";
ctx.shadowBlur = 8;
for (let i = 0; i < str.length; i++) {
lineWidth += fontSize * dpr // 假定一个字是12px
// console.log(lineWidth, canvasWidth)
......
show.html
......@@ -674,6 +674,8 @@ function canvasTextAutoLine(str, ctx, canvasWidth, initX, initY, lineHeight,font
var fz = fontSize*dpr
ctx.font = (bold?'bold ':'')+`${fz}px "微软雅黑"`;
ctx.fillStyle = "#fff";
ctx.shadowColor = "rgba(0,0,0,0.8)";
ctx.shadowBlur = 8;
for (let i = 0; i < str.length; i++) {
lineWidth += fontSize*dpr // 假定一个字是12px
......
tour.html
......@@ -7,6 +7,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<meta http-equiv="x-ua-compatible" content="IE=edge"/>
<!-- <script src="./libs/jquery/jquery.min.js"></script> -->
<script src="./libs/helper.js"></script>
<script src="./libs/vue/vue.js"></script>
<script src="./libs/axios.min.js"></script>
......@@ -114,8 +115,9 @@
<script>
function krpano_onready_callback2(krpano_interface) {
krpano = krpano_interface;
console.log(krpano)
krpano.set("skin_settings.littleplanetintro", false)
sessionStorage.setItem('is_load',1)
// sessionStorage.setItem('is_load',1)
setTimeout(()=>{
showSwiper()
},1500)
......@@ -125,7 +127,7 @@ function krpano_onready_callback(krpano_interface) {
krpano = krpano_interface;
console.log(krpano)
krpano.set("skin_settings.littleplanetintro", false)
sessionStorage.setItem('is_load',1)
// sessionStorage.setItem('is_load',1)
// setTimeout(() => {
// add_hotspot('完善的设施', 128.862, 4.478)
......@@ -200,7 +202,12 @@ function test(hs) {
}
</script>
<script>
window.onload = function(){
var isPanoLoad = false;
var loadPanoStart = () => {
if(isPanoLoad) {
return;
}
isPanoLoad = true;
if(sessionStorage.getItem('is_load')){
embedpano({
// swf: "tour.swf",
......@@ -224,7 +231,12 @@ window.onload = function(){
});
}
}
window.onload = function(){
loadPanoStart();
}
// $.ready(() =>{
// loadPanoStar();
// });
function _init_wx_jssdk(){
......@@ -259,17 +271,18 @@ async function showSwiper() {
document.getElementById('swiper').style.zIndex = 4
// document.getElementById('swiper').style.left = '0px'
new Swiper(".swiper-container",{
const swiper = new Swiper(".swiper-container",{
pagination: ".swiper-dots",
navigator: {
prev: ".swiper-btn-prev",
next: ".swiper-btn-next"
},
delay: 4000,
autoPlay: true,
autoPlay: false,
vm:vueInstance
});
}
......@@ -307,6 +320,7 @@ var vueInstance = new Vue({
try {
this.slides = await $get('/category/list').then(res=>res.data).catch(err=>{throw err})
// this.slides = this.slides.slice(0, 3)
} catch(e) {
localStorage.removeItem('accessToken');
var code = getQueryByString(location.href,'code')
......
travel.html
......@@ -477,6 +477,9 @@ function canvasTextAutoLine(str, ctx, canvasWidth, initX, initY, lineHeight,font
ctx.font = (bold?'bold ':'')+`${fz}px "微软雅黑"`;
ctx.fillStyle = "#fff";
ctx.shadowColor = "rgba(0,0,0,0.8)";
ctx.shadowBlur = 8;
for (let i = 0; i < str.length; i++) {
lineWidth += fontSize*dpr // 假定一个字是12px
// console.log(lineWidth,canvasWidth)
......
yarn.lock
......@@ -2,33 +2,86 @@
# yarn lockfile v1
alioss@^3.0.0:
version "3.0.0"
resolved "https://registry.npm.taobao.org/alioss/download/alioss-3.0.0.tgz#7101edcda979dc5601c44064d62a77f11759fb01"
dependencies:
fs-extra "^0.26.2"
howdo "^3.2.0"
progress "^1.1.8"
xml2js "^0.4.15"
ydr-utils "^36.0.4"
async@^2.0.1:
version "2.6.3"
resolved "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
dependencies:
lodash "^4.17.14"
balanced-match@^1.0.0:
version "1.0.0"
resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
integrity sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=
dependencies:
balanced-match "^1.0.0"
concat-map "0.0.1"
colors@^1.1.2:
version "1.4.0"
resolved "https://registry.npm.taobao.org/colors/download/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
combined-stream@^1.0.5:
version "1.0.8"
resolved "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
dependencies:
delayed-stream "~1.0.0"
concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
delayed-stream@~1.0.0:
version "1.0.0"
resolved "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
form-data@^1.0.0-rc3:
version "1.0.1"
resolved "https://registry.npm.taobao.org/form-data/download/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
dependencies:
async "^2.0.1"
combined-stream "^1.0.5"
mime-types "^2.1.11"
fs-extra@^0.26.2:
version "0.26.7"
resolved "https://registry.npm.taobao.org/fs-extra/download/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^2.1.0"
klaw "^1.0.0"
path-is-absolute "^1.0.0"
rimraf "^2.2.8"
fs.realpath@^1.0.0:
version "1.0.0"
resolved "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
glob@^7.0.0:
glob@^6.0.1:
version "6.0.4"
resolved "https://registry.npm.taobao.org/glob/download/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
dependencies:
inflight "^1.0.4"
inherits "2"
minimatch "2 || 3"
once "^1.3.0"
path-is-absolute "^1.0.0"
glob@^7.0.0, glob@^7.1.3:
version "7.1.6"
resolved "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
integrity sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
......@@ -37,10 +90,17 @@ glob@^7.0.0:
once "^1.3.0"
path-is-absolute "^1.0.0"
graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
version "4.2.4"
resolved "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
howdo@^3.2.0:
version "3.3.0"
resolved "https://registry.npm.taobao.org/howdo/download/howdo-3.3.0.tgz#9f6e0e2455961b842b431f0934bcfba2f6b9f2e9"
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
dependencies:
once "^1.3.0"
wrappy "1"
......@@ -48,55 +108,94 @@ inflight@^1.0.4:
inherits@2:
version "2.0.4"
resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=
interpret@^1.0.0:
version "1.4.0"
resolved "https://registry.npm.taobao.org/interpret/download/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
integrity sha1-Zlq4vE2iendKQFhOgS4+D6RbGh4=
minimatch@^3.0.4:
jsonfile@^2.1.0:
version "2.4.0"
resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
optionalDependencies:
graceful-fs "^4.1.6"
klaw@^1.0.0:
version "1.3.1"
resolved "https://registry.npm.taobao.org/klaw/download/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
optionalDependencies:
graceful-fs "^4.1.9"
lodash@^4.17.14:
version "4.17.20"
resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.20.tgz?cache=0&sync_timestamp=1597337718841&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
marked@^0.3.5:
version "0.3.19"
resolved "https://registry.npm.taobao.org/marked/download/marked-0.3.19.tgz?cache=0&sync_timestamp=1594690220714&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmarked%2Fdownload%2Fmarked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
mime-db@1.44.0:
version "1.44.0"
resolved "https://registry.npm.taobao.org/mime-db/download/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
mime-types@^2.1.11:
version "2.1.27"
resolved "https://registry.npm.taobao.org/mime-types/download/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
dependencies:
mime-db "1.44.0"
"minimatch@2 || 3", minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
integrity sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=
dependencies:
brace-expansion "^1.1.7"
once@^1.3.0:
version "1.4.0"
resolved "https://registry.npm.taobao.org/once/download/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
dependencies:
wrappy "1"
path-is-absolute@^1.0.0:
version "1.0.1"
resolved "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
path-parse@^1.0.6:
version "1.0.6"
resolved "https://registry.npm.taobao.org/path-parse/download/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
integrity sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=
progress@^1.1.8:
version "1.1.8"
resolved "https://registry.npm.taobao.org/progress/download/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
promiseify@^0.2.0:
version "0.2.0"
resolved "https://registry.npm.taobao.org/promiseify/download/promiseify-0.2.0.tgz#d2817cb12ee4d2c1b3adbc5ee58cfb569ff7aba6"
rechoir@^0.6.2:
version "0.6.2"
resolved "https://registry.npm.taobao.org/rechoir/download/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
dependencies:
resolve "^1.1.6"
resolve@^1.1.6:
version "1.17.0"
resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
integrity sha1-sllBtUloIxzC0bt2p5y38sC/hEQ=
dependencies:
path-parse "^1.0.6"
rimraf@^2.2.8:
version "2.7.1"
resolved "https://registry.npm.taobao.org/rimraf/download/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
dependencies:
glob "^7.1.3"
sax@>=0.6.0:
version "1.2.4"
resolved "https://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
shelljs@^0.8.3:
version "0.8.4"
resolved "https://registry.npm.taobao.org/shelljs/download/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
integrity sha1-3naE/ut2f4cWsyYHiooAh1iQ48I=
dependencies:
glob "^7.0.0"
interpret "^1.0.0"
......@@ -105,9 +204,30 @@ shelljs@^0.8.3:
silly-datetime@^0.1.2:
version "0.1.2"
resolved "https://registry.npm.taobao.org/silly-datetime/download/silly-datetime-0.1.2.tgz#21978e8e8d8481616063ac112ff14693f06eb85b"
integrity sha1-IZeOjo2EgWFgY6wRL/FGk/BuuFs=
wrappy@1:
version "1.0.2"
resolved "https://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
xml2js@^0.4.15:
version "0.4.23"
resolved "https://registry.npm.taobao.org/xml2js/download/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
dependencies:
sax ">=0.6.0"
xmlbuilder "~11.0.0"
xmlbuilder@~11.0.0:
version "11.0.1"
resolved "https://registry.npm.taobao.org/xmlbuilder/download/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
ydr-utils@^36.0.4:
version "36.1.1"
resolved "https://registry.npm.taobao.org/ydr-utils/download/ydr-utils-36.1.1.tgz#a6e5ef41e8a91f037fe101e1d58cebedc5655505"
dependencies:
colors "^1.1.2"
form-data "^1.0.0-rc3"
fs-extra "^0.26.2"
glob "^6.0.1"
howdo "^3.2.0"
marked "^0.3.5"
promiseify "^0.2.0"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment