Commit 67f47ccc authored by ganjingcun's avatar ganjingcun

0521

parent 007e8ff6
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="content"> <div class="content">
<div class="container"> <div class="container">
<template> <template>
<el-alert title="上传ydk文件和填写必要的信息之后,卡组表格即可自动生成" type="success"> <el-alert title="上传YGOPro的卡组文件,既可生成实卡参赛卡表,参赛卡表可用于参加决斗都市。" type="success">
</el-alert> </el-alert>
<hr> <hr>
<el-alert v-if="isIE" title="您的浏览器不支持卡表打印功能。 <el-alert v-if="isIE" title="您的浏览器不支持卡表打印功能。
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</el-form-item> </el-form-item>
<el-form-item label="备选项" :label-width="formLabelWidth"> <el-form-item label="备选项" :label-width="formLabelWidth">
<el-checkbox v-model="checked">是否生成图片</el-checkbox> <!--<el-checkbox v-model="checked">是否生成图片</el-checkbox>-->
<el-checkbox v-model="checked2">是否打印(会帮您调用打印程序)</el-checkbox> <el-checkbox v-model="checked2">是否打印(会帮您调用打印程序)</el-checkbox>
</el-form-item> </el-form-item>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
demo_title: "", demo_title: "",
demo_url: "", demo_url: "",
demo1: [], demo1: [],
checked: false, // checked: false,
checked2: false, checked2: false,
demo2: [] demo2: []
} }
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
gameid: this.form.gameid, gameid: this.form.gameid,
date: date, date: date,
id: this.downloadPath.slice(7), id: this.downloadPath.slice(7),
img: this.checked, // img: this.checked,
print: this.checked2, print: this.checked2,
} }
......
...@@ -61,7 +61,8 @@ ...@@ -61,7 +61,8 @@
var self = this var self = this
self.downloadUrls['windows'] = "https://mycard.moe" self.downloadUrls['windows'] = "https://mycard.moe"
self.downloadUrls['mac'] = "https://mycard.moe" self.downloadUrls['mac'] = "https://mycard.moe"
self.downloadUrls['android'] = "https://pan.baidu.com/s/1eRWiWRC" // self.downloadUrls['android'] = "https://pan.baidu.com/s/1eRWiWRC"
self.downloadUrls['android'] = "http://zhushou.360.cn/detail/index/soft_id/2972822"
// API.getDownloadUrls().then((res) => { // API.getDownloadUrls().then((res) => {
// let assets = res.data.assets // let assets = res.data.assets
// for (let i of assets) { // for (let i of assets) {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="generator" content="pdf2htmlEX" /> <meta name="generator" content="pdf2htmlEX" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<script src="assets/js/dom-to-image.min.js"></script> <!--<script src="assets/js/dom-to-image.min.js"></script>-->
<style type="text/css"> <style type="text/css">
/*! /*!
* Base CSS for pdf2htmlEX * Base CSS for pdf2htmlEX
...@@ -2474,17 +2474,17 @@ ...@@ -2474,17 +2474,17 @@
this.calTotal(); this.calTotal();
if (img && img === "true") { // if (img && img === "true") {
setTimeout(function () { // setTimeout(function () {
domtoimage.toJpeg(document.getElementById('page-container'), { quality: 1 }) // domtoimage.toJpeg(document.getElementById('page-container'), { quality: 1 })
.then(function (dataUrl) { // .then(function (dataUrl) {
var link = document.createElement('a'); // var link = document.createElement('a');
link.download = 'deck-image.jpeg'; // link.download = 'deck-image.jpeg';
link.href = dataUrl; // link.href = dataUrl;
link.click(); // link.click();
}); // });
}, 100) // }, 100)
} // }
if (print && print === "true") { if (print && print === "true") {
setTimeout(function () { setTimeout(function () {
...@@ -2509,9 +2509,9 @@ ...@@ -2509,9 +2509,9 @@
deck: { deck: {
name: "Joe xx xx 3", name: "Joe xx xx 3",
event: "SG 2018", event: "SG 2018",
gameidStr: "100121", gameidStr: "",
gameid: ["", "", "", "", "", "", "", "", "", ""], gameid: ["", "", "", "", "", "", "", "", "", ""],
date: ["1", "8", "0", "8", "2", "3"], date: ["", "", "", "", "", ""],
monsterTotal: 0, monsterTotal: 0,
spellTotal: 0, spellTotal: 0,
trapTotal: 0, trapTotal: 0,
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<link rel="stylesheet" href="assets/deck/main.css" /> <link rel="stylesheet" href="assets/deck/main.css" />
<script src="assets/deck/compatibility.min.js"></script> <script src="assets/deck/compatibility.min.js"></script>
<script src="assets/deck/theViewer.min.js"></script> <script src="assets/deck/theViewer.min.js"></script>
<script src="assets/js/dom-to-image.min.js"></script> <!--<script src="assets/js/dom-to-image.min.js"></script>-->
<script> <script>
try { try {
theViewer.defaultViewer = new theViewer.Viewer({}); theViewer.defaultViewer = new theViewer.Viewer({});
...@@ -988,17 +988,17 @@ ...@@ -988,17 +988,17 @@
this.calTotal(); this.calTotal();
if (img && img === "true") { // if (img && img === "true") {
setTimeout(function () { // setTimeout(function () {
domtoimage.toJpeg(document.getElementById('page-container'), { quality: 1 }) // domtoimage.toJpeg(document.getElementById('page-container'), { quality: 1 })
.then(function (dataUrl) { // .then(function (dataUrl) {
var link = document.createElement('a'); // var link = document.createElement('a');
link.download = 'deck-image.jpeg'; // link.download = 'deck-image.jpeg';
link.href = dataUrl; // link.href = dataUrl;
link.click(); // link.click();
}); // });
}, 100) // }, 100)
} // }
if (print && print === "true") { if (print && print === "true") {
setTimeout(function () { setTimeout(function () {
......
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 to comment