Skip to content

shuzilixiangwaibao / wanda-vr

Go to a project
Commit ec6291f6 by 杨翰文
Options

fix: 修改BUG

parent eb879bba
Showing with 128 additions and 66 deletions
alioss.json
......@@ -18,10 +18,10 @@
"./font/**/*",
"./images/**/*", "./libs/**/*", "./panos/**/*", "./plugins/**/*"],
"dest": "/danzhai-holiday-test/v7/",
"dest": "/danzhai-holiday/",
"parallel": 10,
"cacheControl": "public",
"expires": 31536000,
......
images/show/share.png
images/show/share.png

1.44 KB | W: | H:

images/show/share.png

1.48 KB | W: | H:

images/show/share.png
images/show/share.png
images/show/share.png
images/show/share.png
  • 2-up
  • Swipe
  • Onion skin
index.html
......@@ -55,7 +55,7 @@
.go {
position: absolute;
width: 2.49rem;
bottom: 0.31rem;
bottom: 0.55rem;
left: 50%;
transform: translate(-50%, 0);
animation: btn 2s ease infinite;
......@@ -66,8 +66,8 @@
}
50% {
transform: translate(-50%, 0px) scale(0.95);
opacity: 0.8;
transform: translate(-50%, 0px) scale(0.85);
opacity: 0.5;
}
100% {
......@@ -145,6 +145,7 @@ async function init_applcation() {
init_applcation()
function toPano() {
clearPageHistory();
location.href = './tour.html'
}
</script>
......
libs/helper.js
......@@ -163,3 +163,16 @@ const WX_JSSDK_INIT = (vm, jsApiListList) => new Promise((resolve, reject) => {
})
})
function setPageHistory(){
const history = JSON.parse(sessionStorage.getItem('history') || '[]');
history.push(location.href);
sessionStorage.setItem('history', JSON.stringify(history));
}
function clearPageHistory(){
sessionStorage.setItem('history', JSON.stringify([]));
}
setPageHistory();
function getPageHistory() {
return JSON.parse(sessionStorage.getItem('history') || '[]');
}
libs/html2canvas.js
/*!
* html2canvas 1.0.0-rc.5 <https://html2canvas.hertzen.com>
* Copyright (c) 2019 Niklas von Hertzen <https://hertzen.com>
* html2canvas 1.0.0-rc.7 <https://html2canvas.hertzen.com>
* Copyright (c) 2020 Niklas von Hertzen <https://hertzen.com>
* Released under MIT License
*/
(function (global, factory) {
......@@ -3790,12 +3790,29 @@
prefix: false,
type: PropertyDescriptorParsingType.LIST,
parse: function (tokens) {
return tokens.filter(isStringToken$1).map(function (token) { return token.value; });
var accumulator = [];
var results = [];
tokens.forEach(function (token) {
switch (token.type) {
case TokenType.IDENT_TOKEN:
case TokenType.STRING_TOKEN:
accumulator.push(token.value);
break;
case TokenType.NUMBER_TOKEN:
accumulator.push(token.number.toString());
break;
case TokenType.COMMA_TOKEN:
results.push(accumulator.join(' '));
accumulator.length = 0;
break;
}
});
if (accumulator.length) {
results.push(accumulator.join(' '));
}
return results.map(function (result) { return (result.indexOf(' ') === -1 ? result : "'" + result + "'"); });
}
};
var isStringToken$1 = function (token) {
return token.type === TokenType.STRING_TOKEN || token.type === TokenType.IDENT_TOKEN;
};
var fontSize = {
name: "font-size",
......@@ -4524,7 +4541,10 @@
var isTextNode = function (node) { return node.nodeType === Node.TEXT_NODE; };
var isElementNode = function (node) { return node.nodeType === Node.ELEMENT_NODE; };
var isHTMLElementNode = function (node) {
return typeof node.style !== 'undefined';
return isElementNode(node) && typeof node.style !== 'undefined' && !isSVGElementNode(node);
};
var isSVGElementNode = function (element) {
return typeof element.className === 'object';
};
var isLIElement = function (node) { return node.tagName === 'LI'; };
var isOLElement = function (node) { return node.tagName === 'OL'; };
......@@ -5088,7 +5108,13 @@
if (isStyleElement(node)) {
return this.createStyleClone(node);
}
return node.cloneNode(false);
var clone = node.cloneNode(false);
// @ts-ignore
if (isImageElement(clone) && clone.loading === 'lazy') {
// @ts-ignore
clone.loading = 'eager';
}
return clone;
};
DocumentCloner.prototype.createStyleClone = function (node) {
try {
......@@ -5213,12 +5239,12 @@
return node.cloneNode(false);
}
var window = node.ownerDocument.defaultView;
if (isHTMLElementNode(node) && window) {
if (window && isElementNode(node) && (isHTMLElementNode(node) || isSVGElementNode(node))) {
var clone = this.createElementClone(node);
var style = window.getComputedStyle(node);
var styleBefore = window.getComputedStyle(node, ':before');
var styleAfter = window.getComputedStyle(node, ':after');
if (this.referenceElement === node) {
if (this.referenceElement === node && isHTMLElementNode(clone)) {
this.clonedReferenceElement = clone;
}
if (isBodyElement(clone)) {
......@@ -5244,7 +5270,7 @@
clone.appendChild(after);
}
this.counters.pop(counters);
if (style && this.options.copyStyles && !isIFrameElement(node)) {
if (style && (this.options.copyStyles || isSVGElementNode(node)) && !isIFrameElement(node)) {
copyCSSStyles(style, clone);
}
//this.inlineAllImages(clone);
......@@ -5330,10 +5356,15 @@
}
});
anonymousReplacedElement.className = PSEUDO_HIDE_ELEMENT_CLASS_BEFORE + " " + PSEUDO_HIDE_ELEMENT_CLASS_AFTER;
clone.className +=
pseudoElt === PseudoElementType.BEFORE
? " " + PSEUDO_HIDE_ELEMENT_CLASS_BEFORE
: " " + PSEUDO_HIDE_ELEMENT_CLASS_AFTER;
var newClassName = pseudoElt === PseudoElementType.BEFORE
? " " + PSEUDO_HIDE_ELEMENT_CLASS_BEFORE
: " " + PSEUDO_HIDE_ELEMENT_CLASS_AFTER;
if (isSVGElementNode(clone)) {
clone.className.baseValue += newClassName;
}
else {
clone.className += newClassName;
}
return anonymousReplacedElement;
};
DocumentCloner.destroy = function (container) {
......@@ -5747,7 +5778,7 @@
else if (order_1 > 0) {
var index_2 = 0;
parentStack.positiveZIndex.some(function (current, i) {
if (order_1 > current.element.container.styles.zIndex.order) {
if (order_1 >= current.element.container.styles.zIndex.order) {
index_2 = i + 1;
return false;
}
......@@ -6904,7 +6935,9 @@
if (options === void 0) { options = {}; }
return renderElement(element, options);
};
CacheStorage.setContext(window);
if (typeof window !== 'undefined') {
CacheStorage.setContext(window);
}
var renderElement = function (element, opts) { return __awaiter(_this, void 0, void 0, function () {
var ownerDocument, defaultView, instanceName, _a, width, height, left, top, defaultResourceOptions, resourceOptions, defaultOptions, options, windowBounds, documentCloner, clonedElement, container, documentBackgroundColor, bodyBackgroundColor, bgColor, defaultBackgroundColor, backgroundColor, renderOptions, canvas, renderer, root, renderer;
return __generator(this, function (_b) {
......@@ -7031,4 +7064,4 @@
return html2canvas;
}));
//# sourceMappingURL=html2canvas.js.map
//# sourceMappingURL=html2canvas.js.map
\ No newline at end of file
libs/html2canvas.min.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
route.html
......@@ -173,11 +173,12 @@
}
.bottom__icon {
width: 0.63rem;
height: 0.63rem;
position: absolute;
right: 0.41rem;
bottom: 0.51rem;
width: 0.55rem;
height: 0.84rem;
position: absolute;
right: 0.41rem;
bottom:0.51rem;
filter:drop-shadow(0 0 15px rgba(0,0,0,0.8));
}
.modal-wrap {
......@@ -532,8 +533,7 @@
<div class="route-play-title">白天</div>
</div>
<div class="channel-detail-text">
环湖步道晨跑 - 探访金汞矿 - 排廷瀑布 - 高要梯田
观景台 - 探访卡拉村鸟笼
环湖步道晨跑 - 探访金汞矿 - 排廷瀑布 - 高要梯田观景台 - 探访卡拉村鸟笼
</div>
<div class="channel-detail-title">
<div class="route-play-tag"></div>
......@@ -566,8 +566,7 @@
<span>第四天</span>
</div>
<div class="channel-text">
登龙泉山(尤公山)- 喝排佐鸡汤 - 游锦绣谷（韭菜
沟森林公园）
登龙泉山(尤公山)- 喝排佐鸡汤 - 游锦绣谷（韭菜沟森林公园）
</div>
</div>
</div>
......
show.html
......@@ -144,6 +144,7 @@
font-size: 0.3rem;
color: #fff;
line-height: 0.55rem;
text-align: justify;
}
......@@ -161,11 +162,12 @@
/*background-position: bottom center;*/
}
.bottom__icon{
width: 0.63rem;
height: 0.63rem;
width: 0.55rem;
height: 0.84rem;
position: absolute;
right: 0.41rem;
bottom:0.51rem;
filter:drop-shadow(0 0 15px rgba(0,0,0,0.8));
}
.pic-modal-wrap{
......@@ -463,22 +465,22 @@ var vueInstance = new Vue({
},
generatePost() {
setTimeout(() => {
// setTimeout(() => {
try {
html2canvas(document.body, {
allowTaint: true,
useCORS: true,
backgroundColor: null
}).then((canvas) => {
this.postData = canvas.toDataURL();
}).catch(e => {
}).finally(() => {
});
} catch(e) {
// alert(e);
}
}, 200)
// try {
// html2canvas(document.body, {
// allowTaint: true,
// useCORS: true,
// backgroundColor: null
// }).then((canvas) => {
// this.postData = canvas.toDataURL();
// }).catch(e => {
// }).finally(() => {
// });
// } catch(e) {
// // alert(e);
// }
// }, 200)
},
closeModal(){
this.showPoster = false
......@@ -574,7 +576,7 @@ var vueInstance = new Vue({
async setActive(idx,initJsSdk=true){
this.activeIdx = Number(idx)
//this.shareDesc = this.navs[this.activeIdx].content
this.curShareImg = (await createImgByAsync(this.navs[this.activeIdx].share_image)).src;
this.curShareImg = this.navs[this.activeIdx].share_image;
if(initJsSdk)this.shareToFirends()
},
async _init_func(){
......@@ -590,8 +592,8 @@ var vueInstance = new Vue({
// this.setActive(idx)
// }
var userInfo = await getUserInfo();
userInfo.qrcode = (await createImgByAsync(userInfo.qrcode)).src;
this.curShareImg = (await createImgByAsync(this.navs[this.activeIdx].share_image)).src;
// userInfo.qrcode = (await createImgByAsync(userInfo.qrcode)).src;
this.curShareImg = this.navs[this.activeIdx].share_image;
console.log(userInfo);
this.$set(this,'userInfo',userInfo)
var largeShareName = `${userInfo.nickname}的`
......
test.html
......@@ -161,11 +161,12 @@
/*background-position: bottom center;*/
}
.bottom__icon{
width: 0.63rem;
height: 0.63rem;
width: 0.55rem;
height: 0.84rem;
position: absolute;
right: 0.41rem;
bottom:0.51rem;
filter:drop-shadow(0 0 15px rgba(0,0,0,0.8));
}
.pic-modal-wrap{
......
tour.html
......@@ -72,6 +72,13 @@
right: 0;
display: flex;
justify-content: center;
opacity: 0;
transform: scale(1.2) translate(0, -20px)
}
.swiper-head-title.show {
transition: all 1s;
opacity: 1;
transform: scale(1)
}
.swiper-head-title img {
width: 18rem;
......@@ -168,13 +175,14 @@
font-size: 30px;
text-align: center;
text-shadow: 0 0 10px rgba(0,0,0,0.7);
font-family: myFont;
/* font-family: myFont; */
font-weight: 600;
}
</style>
</head>
<body>
<div id="pano" style="width:100%;height:100%;"></div>
<div class="swiper-head-title">
<div class="swiper-head-title" id="headTitle">
<img src="./images/load/big_name.png" alt="">
</div>
<div id="swiper" style="width:100%;height:100%;">
......@@ -299,7 +307,9 @@ var loadPanoStart = () => {
return;
}
isPanoLoad = true;
if(sessionStorage.getItem('is_load')){
const pageHistory = getPageHistory();
if(pageHistory.length >= 2 && pageHistory[pageHistory.length - 2].indexOf('index.html') == -1){
// if(sessionStorage.getItem('is_load')){
embedpano({
// swf: "tour.swf",
xml: "tour_no_littleplantintro.xml",
......@@ -354,7 +364,7 @@ function _init_wx_jssdk(){
}
async function showSwiper() {
console.log('showSwipershowSwipershowSwiper')
document.getElementById('headTitle').className += ' show';
// alert('showSwipershowSwipershowSwiper')
......@@ -369,7 +379,7 @@ async function showSwiper() {
next: ".swiper-btn-next"
},
delay: 4000,
autoPlay: false,
autoPlay: true,
vm:vueInstance
});
......
travel.html
......@@ -138,6 +138,7 @@
font-size: 0.3rem;
color: #fff;
line-height: 0.55rem;
text-align: justify;
}
.bottom{
......@@ -154,11 +155,12 @@
/*background-position: bottom center;*/
}
.bottom__icon{
width: 0.63rem;
height: 0.63rem;
width: 0.55rem;
height: 0.84rem;
position: absolute;
right: 0.41rem;
bottom:0.51rem;
filter:drop-shadow(0 0 15px rgba(0,0,0,0.8));
}
......@@ -286,6 +288,7 @@
.content__text{
color: #fff;
font-size: 0.29rem;
text-align: justify;
}
.channel-title{
......@@ -376,8 +379,7 @@
</div>
<div class="content__text" v-if="activeIdx===1">
<div class="channel-text" style="padding-top: 0.45rem;">
距离丹寨较近的高铁站为凯里南站、三都县站、都匀东站，从目的地乘坐高铁到达上述高铁站后，再换乘大巴车前往丹寨万
达小镇，车程大约 30-40 分钟。
距离丹寨较近的高铁站为凯里南站、三都县站、都匀东站，从目的地乘坐高铁到达上述高铁站后，再换乘大巴车前往丹寨万达小镇，车程大约 30-40 分钟。
</div>
</div>
<div class="content__text" v-if="activeIdx===2">
......@@ -388,9 +390,9 @@
<div class="content__text" v-if="activeIdx===3">
<div class="channel-text" style="padding-top: 0.45rem;">
贵阳方向自驾出发：<br/>
G76 厦蓉高速一 S62 余安高速一丹寨县；<br/>
G76 厦蓉高速 一 S62 余安高速一丹寨县；<br/>
长沙方向自驾出发：<br/>
S41 长 潭 西 高 速 一 S50 长 韶 娄 高 速 一 S55 二广高一 G60 沪昆高速一 S62 余安高速一丹寨县 ;<br/>
S41 长潭西高速 一 S50 长韶娄高速 一 S55 二广高一 G60 沪昆高速一 S62 余安高速一丹寨县 ;<br/>
南宁方向自驾出发：<br/>
G75 兰海高速一 G76 厦蓉高速一 S62余安高速一丹寨县；<br/>
昆明方向自驾出发：<br/>
......@@ -398,7 +400,7 @@
成都方向自驾出发：<br/>
G5 京昆高速一 G4215 蓉遵高速一 G56杭瑞高速一 G75 兰海高速一 G60 沪昆高速一 G76 厦蓉高速一 S62 余安高速一丹寨县 ;<br/>
重庆方向自驾出发：<br/>
G65 包 茂 高 速 一 G75 兰 海 高 速 一G6001 贵阳绕城高速一 G60 沪昆高速一 G76 厦蓉高速一 S62 余安高速一丹寨县。
G65 包茂高速 一 G75 兰海高速 一G6001 贵阳绕城高速一 G60 沪昆高速一 G76 厦蓉高速一 S62 余安高速一丹寨县。
</div>
</div>
......
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