diff --git a/front/electron-builder.yml b/front/electron-builder.yml
index 49ac237..6e218a0 100644
--- a/front/electron-builder.yml
+++ b/front/electron-builder.yml
@@ -1,5 +1,5 @@
appId: com.electron.lichong
-productName: 桌面应用
+productName: 时光机
directories:
buildResources: build
files:
diff --git a/front/src/main/index.js b/front/src/main/index.js
index 3c43783..499d723 100644
--- a/front/src/main/index.js
+++ b/front/src/main/index.js
@@ -9,16 +9,17 @@ console.log(process.versions.node)
let mainWindow
function createWindow() {
mainWindow = new BrowserWindow({
- // fullscreen: true,
- // fullscreenable: true,
- minWidth: 432,
- minHeight: 768,
+ fullscreen: true,
+ fullscreenable: true,
+ // minWidth: 432,
+ // minHeight: 768,
show: false,
autoHideMenuBar: true,
icon: logoIcon,
webPreferences: {
preload: path.resolve(__dirname, '../preload/index.js'),
- sandbox: false
+ sandbox: false,
+ webSecurity:false,
}
})
mainWindow.on('ready-to-show', () => {
diff --git a/front/src/renderer/index.html b/front/src/renderer/index.html
index 6e808cb..c1cb9b1 100644
--- a/front/src/renderer/index.html
+++ b/front/src/renderer/index.html
@@ -7,7 +7,7 @@
diff --git a/front/src/renderer/src/App.vue b/front/src/renderer/src/App.vue
index 3455254..19ad3fb 100644
--- a/front/src/renderer/src/App.vue
+++ b/front/src/renderer/src/App.vue
@@ -39,8 +39,21 @@
+
+ {{ dispalyTitle }}
+
+ style="position: absolute;top: 34vh;left: calc(50vw - 90px);">
+
+
+
+
+ {{ pngItem.age }}岁
+
+
+
+
@@ -70,12 +83,14 @@ export default {
img: ''
},
videoEL: null,
- isVip: true,
+ isVip: false,
pngObj: {},
qrString: "",
shexiangotuBtn: false,
paizhaoBtn: true,
uploadBtn: true,
+ dispalyTitle: "",
+ pngList: []
}
},
methods: {
@@ -182,7 +197,7 @@ export default {
// let baseurl = "http://127.0.0.1:7001"
that.qrString = `${baseurl}/?id=${_.get(that.pngObj, ["list", "_id"])}`
let canvas = document.getElementById('canvas1')
- console.log(777, that.pngObj, baseurl)
+ console.log(777, that.pngObj, canvas)
QRCode.toCanvas(canvas, that.qrString, function (error) {
if (error) {
ElMessage({
@@ -198,6 +213,8 @@ export default {
})
}
})
+ this.dispalyTitle = `[${that.form.name || "未填写"}]10岁-80岁照片模拟`
+ this.pngList = _.get(that.pngObj, ["list", "createImgList"], [])
// 设置5秒后关闭弹窗
setTimeout(() => {
that.qrString = ""
@@ -205,6 +222,8 @@ export default {
ctx.width = 500
ctx.height = 500
ctx.clearRect(0, 0, 500, 500);
+ this.dispalyTitle = ""
+ this.pngList = []
}, 1000 * 60 * 10);
}
})
@@ -242,10 +261,9 @@ export default {
}
},
async mounted() {
- console.log(8877, QRCode)
- this.watchPng()
+
// this.testFun()
- let fiveDay = dayjs('2024-05-21T00:00:00').valueOf()
+ let fiveDay = dayjs('2024-05-24T00:00:00').valueOf()
if (!this.isVip) {
if (dayjs().valueOf() > fiveDay) {
this.isVip = false
@@ -254,6 +272,8 @@ export default {
this.isVip = true
}
}
+ console.log(8877, QRCode)
+ this.watchPng()
},
watch: {},
computed: {}
@@ -296,4 +316,15 @@ export default {
background-color: #83838399;
border: none;
}
+
+.noVip {
+ margin-top: 45vh;
+ margin-left: 25vw;
+}
+
+.noVipTag {
+ font-size: 48px;
+ line-height: 48px;
+ padding: 36px;
+}