Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix:1.ios微信内置浏览器,截图不能关闭问题,2.第二次进入会显示“”人生回放“”按钮问题 #218

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"@babel/preset-env": "^7.15.4",
"babel-loader": "^8.2.2",
"core-js": "^3.17.2",
"dom-to-image": "^2.6.0",
"webpack": "^5.51.2",
"webpack-dev-server": "^4.1.0",
"xlsx": "^0.17.0"
Expand Down
2 changes: 1 addition & 1 deletion public/bundle.js

Large diffs are not rendered by default.

53 changes: 34 additions & 19 deletions src/app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { summary } from './functions/summary.js';
import { summary } from './functions/summary.js'
import Life from './life.js'
import domtoimage from 'dom-to-image';
import { getRate, getGrade } from './functions/addition.js';
import Life from './life.js';

class App{
constructor(){
Expand Down Expand Up @@ -347,19 +348,20 @@ class App{

// Trajectory
const trajectoryPage = $(`
<div id="main">
<ul id="lifeProperty" class="lifeProperty"></ul>
<ul id="lifeTrajectory" class="lifeTrajectory"></ul>
<div class="btn-area">
<button id="auto" class="mainbtn">自动播放</button>
<button id="auto2x" class="mainbtn">自动播放2x</button>
<button id="summary" class="mainbtn">人生总结</button>
<button id="domToImage" class="mainbtn">人生回放</button>
</div>
<div class="domToImage2wx">
<img src="" id="endImage" />
<div id="main">
<ul id="lifeProperty" class="lifeProperty"></ul>
<ul id="lifeTrajectory" class="lifeTrajectory"></ul>
<div class="btn-area">
<button id="auto" class="mainbtn">自动播放</button>
<button id="auto2x" class="mainbtn">自动播放2x</button>
<button id="summary" class="mainbtn">人生总结</button>
<button id="domToImage" class="mainbtn">人生回放</button>
</div>
<div class="domToImage2wx">
<img src="" id="successSaveImage" />
<button id="hideDomToImageBtn" style="position: fixed; top:auto; bottom: 20px; left: 75%">隐藏截图</button>
</div>
</div>
</div>
`);

trajectoryPage
Expand Down Expand Up @@ -388,7 +390,7 @@ class App{
trajectoryPage.find('#summary').show();
trajectoryPage.find('#auto').hide();
trajectoryPage.find('#auto2x').hide();
// trajectoryPage.find('#domToImage').show();
trajectoryPage.find('#domToImage').show();
}
const property = this.#life.getLastRecord();
$("#lifeProperty").html(`
Expand All @@ -399,7 +401,7 @@ class App{
<li><span>快乐</span><span>${property.SPR}</span></li>
`);
});
// html2canvas
// domToImage
trajectoryPage
.find('#domToImage')
.click(()=>{
Expand All @@ -414,10 +416,18 @@ class App{
$("#lifeTrajectory").removeClass("deleteFixed");
// 微信内置浏览器,显示图片,需要用户单独保存
if(ua.match(/MicroMessenger/i)=="micromessenger") {
$('#endImage').attr('src', dataUrl);
trajectoryPage.find('#hideDomToImageBtn').show();
$('#successSaveImage').attr('src', dataUrl);
}

});
});
// 微信内置浏览器 隐藏截图
trajectoryPage
.find('#hideDomToImageBtn')
.click(()=>{
trajectoryPage.find('#successSaveImage').hide();
trajectoryPage.find('#hideDomToImageBtn').hide();
})
.hide();

Expand Down Expand Up @@ -477,7 +487,7 @@ class App{
<button id="again" class="mainbtn"><span class="iconfont">&#xe6a7;</span>再次重开</button>
</div>
`);

summaryPage
.find('#again')
.click(()=>{
Expand All @@ -497,6 +507,7 @@ class App{
this.#currentPage = 'loading';
},
},

index: {
page: indexPage,
btnAchievement: indexPage.find('#achievement'),
Expand Down Expand Up @@ -642,6 +653,10 @@ class App{
this.#currentPage = 'trajectory';
trajectoryPage.find('#lifeTrajectory').empty();
trajectoryPage.find('#summary').hide();
// fix 第二次进入时不显示人生回放功能
trajectoryPage.find('#domToImage').hide();
// 在微信内置浏览器中,显示的截图不能关闭,增加 隐藏截图 按钮,初始化隐藏
trajectoryPage.find('#hideDomToImageBtn').hide();
trajectoryPage.find('#auto').show();
trajectoryPage.find('#auto2x').show();
this.#isEnd = false;
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1633,6 +1633,11 @@ dns-txt@^2.0.2:
dependencies:
buffer-indexof "^1.0.0"

dom-to-image@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/dom-to-image/-/dom-to-image-2.6.0.tgz#8a503608088c87b1c22f9034ae032e1898955867"
integrity sha1-ilA2CAiMh7HCL5A0rgMuGJiVWGc=

[email protected]:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
Expand Down