From 72e42d6830494edaf33dc86f68aeae68eb00bd20 Mon Sep 17 00:00:00 2001
From: lc18518571399 <18518571399@163.com>
Date: Sun, 19 May 2024 21:05:16 +0800
Subject: [PATCH] update

---
 front/electron-builder.yml     |  2 +-
 front/src/main/index.js        | 11 +++++----
 front/src/renderer/index.html  |  2 +-
 front/src/renderer/src/App.vue | 43 +++++++++++++++++++++++++++++-----
 4 files changed, 45 insertions(+), 13 deletions(-)

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 @@
     <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'"
+      content="default-src 'self'; script-src 'self';img-src 'self' data:; style-src 'self' 'unsafe-inline'"
     />
   </head>
 
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 @@
           <video ref="videoEL" width="500px" height="480px" autoplay v-if="!form.img"></video>
           <!--canvas截取流-->
           <canvas ref="canvas" width="500px" height="500px" id="canvas" v-show="form.img"></canvas>
+          <div v-if="dispalyTitle" style="position: absolute;color: #fff;top: 28vh;left: 40vw;font-size: 1.5em;">
+            {{ dispalyTitle }}
+          </div>
           <canvas width="180px" height="180px" id="canvas1"
-            style="position: absolute;top: 48vh;left: calc(50vw - 90px);"></canvas>
+            style="position: absolute;top: 34vh;left: calc(50vw - 90px);"></canvas>
+
+          <el-row v-if="pngList.length" style="position: absolute;color: #fff;top: 57vh;left: 1vw;">
+            <el-col :span="6" v-for="( pngItem, pngIndex) in pngList">
+              <v-row>
+                <v-col :span="4">{{ pngItem.age }}岁</v-col>
+                <v-col :span="20"><img :src="pngItem.png" :alt="`${pngItem.age}岁`" width="150px"
+                    height="150px" /></v-col>
+              </v-row>
+            </el-col>
+          </el-row>
         </div>
       </div>
     </dv-border-box1>
@@ -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;
+}
 </style>