diff --git a/src/assets/images/index/bg.jpg b/src/assets/images/index/bg.jpg index c7f0a85..49573e8 100644 Binary files a/src/assets/images/index/bg.jpg and b/src/assets/images/index/bg.jpg differ diff --git a/src/assets/images/index/bottom-bg.png b/src/assets/images/index/bottom-bg.png index 56c74e4..f59514c 100644 Binary files a/src/assets/images/index/bottom-bg.png and b/src/assets/images/index/bottom-bg.png differ diff --git a/src/assets/images/index/cloud.png b/src/assets/images/index/cloud.png index d56f895..baec2fe 100644 Binary files a/src/assets/images/index/cloud.png and b/src/assets/images/index/cloud.png differ diff --git a/src/assets/images/index/fan-1.png b/src/assets/images/index/fan-1.png index 01498fd..d3f3bc1 100644 Binary files a/src/assets/images/index/fan-1.png and b/src/assets/images/index/fan-1.png differ diff --git a/src/assets/images/index/fan-2.png b/src/assets/images/index/fan-2.png index 7ae3ada..452c275 100644 Binary files a/src/assets/images/index/fan-2.png and b/src/assets/images/index/fan-2.png differ diff --git a/src/assets/images/index/fan-3.png b/src/assets/images/index/fan-3.png index 93aa7cc..fb5e1dc 100644 Binary files a/src/assets/images/index/fan-3.png and b/src/assets/images/index/fan-3.png differ diff --git a/src/assets/images/index/fan-4.png b/src/assets/images/index/fan-4.png index b31bb9d..d0e12cd 100644 Binary files a/src/assets/images/index/fan-4.png and b/src/assets/images/index/fan-4.png differ diff --git a/src/assets/images/index/firework.png b/src/assets/images/index/firework.png index 44de480..31d7652 100644 Binary files a/src/assets/images/index/firework.png and b/src/assets/images/index/firework.png differ diff --git a/src/assets/images/index/pet-icon.png b/src/assets/images/index/pet-icon.png index ee38768..86bb987 100644 Binary files a/src/assets/images/index/pet-icon.png and b/src/assets/images/index/pet-icon.png differ diff --git a/src/assets/images/index/prize-btn.png b/src/assets/images/index/prize-btn.png index a0b4632..573eca6 100644 Binary files a/src/assets/images/index/prize-btn.png and b/src/assets/images/index/prize-btn.png differ diff --git a/src/assets/images/index/rule-btn.png b/src/assets/images/index/rule-btn.png index 4ec21fd..b149115 100644 Binary files a/src/assets/images/index/rule-btn.png and b/src/assets/images/index/rule-btn.png differ diff --git a/src/assets/images/index/start-btn.png b/src/assets/images/index/start-btn.png index 96a5625..edfc9b5 100644 Binary files a/src/assets/images/index/start-btn.png and b/src/assets/images/index/start-btn.png differ diff --git a/src/assets/images/index/title.png b/src/assets/images/index/title.png index 72723d7..c8d8f62 100644 Binary files a/src/assets/images/index/title.png and b/src/assets/images/index/title.png differ diff --git a/src/assets/images/index/windows.png b/src/assets/images/index/windows.png index e48a612..587282e 100644 Binary files a/src/assets/images/index/windows.png and b/src/assets/images/index/windows.png differ diff --git a/src/assets/images/load/bg.jpg b/src/assets/images/load/bg.jpg index 5b56af3..48292e0 100644 Binary files a/src/assets/images/load/bg.jpg and b/src/assets/images/load/bg.jpg differ diff --git a/src/assets/images/load/icon.png b/src/assets/images/load/icon.png index 7d48515..278f1da 100644 Binary files a/src/assets/images/load/icon.png and b/src/assets/images/load/icon.png differ diff --git a/src/assets/images/qa/bg.jpg b/src/assets/images/qa/bg.jpg index 3433ece..da679c0 100644 Binary files a/src/assets/images/qa/bg.jpg and b/src/assets/images/qa/bg.jpg differ diff --git a/src/assets/images/qa/bottom-bg.png b/src/assets/images/qa/bottom-bg.png index aa55b46..6300e01 100644 Binary files a/src/assets/images/qa/bottom-bg.png and b/src/assets/images/qa/bottom-bg.png differ diff --git a/src/assets/images/qa/gold-icon-2.png b/src/assets/images/qa/gold-icon-2.png index fbd8f5d..c3a896b 100644 Binary files a/src/assets/images/qa/gold-icon-2.png and b/src/assets/images/qa/gold-icon-2.png differ diff --git a/src/assets/images/qa/gold-icon.png b/src/assets/images/qa/gold-icon.png index c112eb8..89d695d 100644 Binary files a/src/assets/images/qa/gold-icon.png and b/src/assets/images/qa/gold-icon.png differ diff --git a/src/assets/images/qa/lantern-icon.png b/src/assets/images/qa/lantern-icon.png index 480500f..a62df4e 100644 Binary files a/src/assets/images/qa/lantern-icon.png and b/src/assets/images/qa/lantern-icon.png differ diff --git a/src/assets/images/qa/question-box.png b/src/assets/images/qa/question-box.png index 24a1a6d..81ee241 100644 Binary files a/src/assets/images/qa/question-box.png and b/src/assets/images/qa/question-box.png differ diff --git a/src/assets/images/result/bg.jpg b/src/assets/images/result/bg.jpg index c42bea6..b198cba 100644 Binary files a/src/assets/images/result/bg.jpg and b/src/assets/images/result/bg.jpg differ diff --git a/src/assets/images/result/blessing-text-1-1.png b/src/assets/images/result/blessing-text-1-1.png index e0f5fae..a0f61bd 100644 Binary files a/src/assets/images/result/blessing-text-1-1.png and b/src/assets/images/result/blessing-text-1-1.png differ diff --git a/src/assets/images/result/blessing-text-1-2.png b/src/assets/images/result/blessing-text-1-2.png index 84bfd6e..852dc11 100644 Binary files a/src/assets/images/result/blessing-text-1-2.png and b/src/assets/images/result/blessing-text-1-2.png differ diff --git a/src/assets/images/result/blessing-text-2-1.png b/src/assets/images/result/blessing-text-2-1.png index c20052d..1772dd5 100644 Binary files a/src/assets/images/result/blessing-text-2-1.png and b/src/assets/images/result/blessing-text-2-1.png differ diff --git a/src/assets/images/result/blessing-text-2-2.png b/src/assets/images/result/blessing-text-2-2.png index 07f8e8e..ab16d61 100644 Binary files a/src/assets/images/result/blessing-text-2-2.png and b/src/assets/images/result/blessing-text-2-2.png differ diff --git a/src/assets/images/result/blessing-text-3-1.png b/src/assets/images/result/blessing-text-3-1.png index b9597a8..bcaace6 100644 Binary files a/src/assets/images/result/blessing-text-3-1.png and b/src/assets/images/result/blessing-text-3-1.png differ diff --git a/src/assets/images/result/blessing-text-3-2.png b/src/assets/images/result/blessing-text-3-2.png index f17af8e..97350e0 100644 Binary files a/src/assets/images/result/blessing-text-3-2.png and b/src/assets/images/result/blessing-text-3-2.png differ diff --git a/src/assets/images/result/cls-btn.png b/src/assets/images/result/cls-btn.png index c35458e..e8d9470 100644 Binary files a/src/assets/images/result/cls-btn.png and b/src/assets/images/result/cls-btn.png differ diff --git a/src/assets/images/result/create-btn.png b/src/assets/images/result/create-btn.png index 97e1987..7839e93 100644 Binary files a/src/assets/images/result/create-btn.png and b/src/assets/images/result/create-btn.png differ diff --git a/src/assets/images/result/go-draw-btn.png b/src/assets/images/result/go-draw-btn.png index 09d456a..634ca34 100644 Binary files a/src/assets/images/result/go-draw-btn.png and b/src/assets/images/result/go-draw-btn.png differ diff --git a/src/assets/images/result/go-share-btn.png b/src/assets/images/result/go-share-btn.png index 55869ea..fe49c44 100644 Binary files a/src/assets/images/result/go-share-btn.png and b/src/assets/images/result/go-share-btn.png differ diff --git a/src/assets/images/result/larnten-1.png b/src/assets/images/result/larnten-1.png index 393de93..993fd19 100644 Binary files a/src/assets/images/result/larnten-1.png and b/src/assets/images/result/larnten-1.png differ diff --git a/src/assets/images/result/larnten-2.png b/src/assets/images/result/larnten-2.png index d6fd0c6..23ecc6c 100644 Binary files a/src/assets/images/result/larnten-2.png and b/src/assets/images/result/larnten-2.png differ diff --git a/src/assets/images/result/larnten-3.png b/src/assets/images/result/larnten-3.png index 852f697..9399177 100644 Binary files a/src/assets/images/result/larnten-3.png and b/src/assets/images/result/larnten-3.png differ diff --git a/src/assets/images/result/larnten-box-1.png b/src/assets/images/result/larnten-box-1.png new file mode 100644 index 0000000..6c627e1 Binary files /dev/null and b/src/assets/images/result/larnten-box-1.png differ diff --git a/src/assets/images/result/larnten-box-2.png b/src/assets/images/result/larnten-box-2.png new file mode 100644 index 0000000..3e52f37 Binary files /dev/null and b/src/assets/images/result/larnten-box-2.png differ diff --git a/src/assets/images/result/larnten-box-3.png b/src/assets/images/result/larnten-box-3.png new file mode 100644 index 0000000..d3dacce Binary files /dev/null and b/src/assets/images/result/larnten-box-3.png differ diff --git a/src/assets/images/result/poster-1.jpg b/src/assets/images/result/poster-1.jpg new file mode 100644 index 0000000..2475c83 Binary files /dev/null and b/src/assets/images/result/poster-1.jpg differ diff --git a/src/assets/images/result/poster-2.jpg b/src/assets/images/result/poster-2.jpg new file mode 100644 index 0000000..ba3c0ea Binary files /dev/null and b/src/assets/images/result/poster-2.jpg differ diff --git a/src/assets/images/result/poster-3.jpg b/src/assets/images/result/poster-3.jpg new file mode 100644 index 0000000..b226f7a Binary files /dev/null and b/src/assets/images/result/poster-3.jpg differ diff --git a/src/assets/images/result/poster.jpg b/src/assets/images/result/poster.jpg deleted file mode 100644 index 7a161bc..0000000 Binary files a/src/assets/images/result/poster.jpg and /dev/null differ diff --git a/src/assets/images/result/preveiw-1.png b/src/assets/images/result/preveiw-1.png index c21d1a0..7a87fe4 100644 Binary files a/src/assets/images/result/preveiw-1.png and b/src/assets/images/result/preveiw-1.png differ diff --git a/src/assets/images/result/preveiw-2.png b/src/assets/images/result/preveiw-2.png index 0028060..8fb07bf 100644 Binary files a/src/assets/images/result/preveiw-2.png and b/src/assets/images/result/preveiw-2.png differ diff --git a/src/assets/images/result/preveiw-3.png b/src/assets/images/result/preveiw-3.png index 67d39b4..037ca0e 100644 Binary files a/src/assets/images/result/preveiw-3.png and b/src/assets/images/result/preveiw-3.png differ diff --git a/src/assets/images/result/product-1.png b/src/assets/images/result/product-1.png index 71ca115..5b2503a 100644 Binary files a/src/assets/images/result/product-1.png and b/src/assets/images/result/product-1.png differ diff --git a/src/assets/images/result/product-2.png b/src/assets/images/result/product-2.png index e47e3a7..cc71a01 100644 Binary files a/src/assets/images/result/product-2.png and b/src/assets/images/result/product-2.png differ diff --git a/src/assets/images/result/product-3.png b/src/assets/images/result/product-3.png index a2f71af..74469e0 100644 Binary files a/src/assets/images/result/product-3.png and b/src/assets/images/result/product-3.png differ diff --git a/src/assets/images/result/text.png b/src/assets/images/result/text.png index e1641f8..1dc23db 100644 Binary files a/src/assets/images/result/text.png and b/src/assets/images/result/text.png differ diff --git a/src/assets/images/result/tips.png b/src/assets/images/result/tips.png index b4793bf..e585489 100644 Binary files a/src/assets/images/result/tips.png and b/src/assets/images/result/tips.png differ diff --git a/src/assets/images/rule/arrow.png b/src/assets/images/rule/arrow.png index d38c0eb..dc12f31 100644 Binary files a/src/assets/images/rule/arrow.png and b/src/assets/images/rule/arrow.png differ diff --git a/src/assets/images/rule/cls-btn.png b/src/assets/images/rule/cls-btn.png index 3e2a561..27a1e32 100644 Binary files a/src/assets/images/rule/cls-btn.png and b/src/assets/images/rule/cls-btn.png differ diff --git a/src/assets/images/rule/icon.png b/src/assets/images/rule/icon.png index c782f1d..1b39a74 100644 Binary files a/src/assets/images/rule/icon.png and b/src/assets/images/rule/icon.png differ diff --git a/src/assets/images/rule/rule-box.png b/src/assets/images/rule/rule-box.png index a72b952..0ee6d6c 100644 Binary files a/src/assets/images/rule/rule-box.png and b/src/assets/images/rule/rule-box.png differ diff --git a/src/components/Index.vue b/src/components/Index.vue index 686b6d4..32772ce 100644 --- a/src/components/Index.vue +++ b/src/components/Index.vue @@ -139,7 +139,7 @@ const showVC = () => { .index-cloud{ pointer-events: none; - @include pos(88px, 46px, 621px, 269px); + @include pos(88px, 46px, 621px, 253px); @include bg_pos("index/cloud.png"); } @@ -151,19 +151,19 @@ const showVC = () => { .index-windows{ pointer-events: none; - @include pos(743px, 744px, 4px, 440px); + @include pos(737px, 744px, 6.5px, 440px); @include bg_pos("index/windows.png"); } .index-pet{ pointer-events: none; - @include pos(234px, 421px, 353px, 614px); + @include pos(234px, 386px, 353px, 614px); @include bg_pos("index/pet-icon.png"); } .index-title { // pointer-events: none; - @include pos(603px, 167px, 75px, 247px); + @include pos(621px, 98px, 44px, 309px); @include bg_pos("index/title.png"); } diff --git a/src/components/Result.vue b/src/components/Result.vue index 58e9f72..f461139 100644 --- a/src/components/Result.vue +++ b/src/components/Result.vue @@ -6,13 +6,19 @@ import { mbtiList } from "@/data"; import { posterCreate } from "@/plugins"; import { Toast } from "vant"; import QRCode from "qrcode"; +import { reactive } from "vue"; // 页面配置初始化 const emit = defineEmits(["ResultPage"]); const userStore = useMainStore(); const posterId = ref(userStore.posterId); //海报背景id:1~4 - +const posterImgList = reactive([ + new URL(`../assets/images/result/poster-1.jpg`, import.meta.url).href, + new URL(`../assets/images/result/poster-2.jpg`, import.meta.url).href, + new URL(`../assets/images/result/poster-3.jpg`, import.meta.url).href, + new URL(`../assets/images/result/poster-4.jpg`, import.meta.url).href, +]) // 生成二维码逻辑 const eqcodePic = ref(); @@ -48,14 +54,14 @@ const createPoster = (event) => { // 背景 { name: "bg", - src: new URL(`../assets/images/result/poster.jpg`, import.meta.url).href, + src: posterImgList[posterId.value-1], pos: { w: 750, h: 1334, x: 0, y: 0 }, }, // 二维码 { name: "eqcode", src: eqcodePic.value, - pos: { w: 140, h: 140, x: 66, y: 1070 }, + pos: { w: 164, h: 164, x: 159, y: 1122 }, }, ], ); @@ -103,7 +109,7 @@ const hideShare = () => {
-
+
@@ -156,45 +162,64 @@ const hideShare = () => { @include pos(750px, 1624px, 0px, 50%); transform: translateY(-50%); - .created-tips{ - @include pos(316px, 91px, -54px, 267px); - @include bg_pos("result/tips.png"); + .larnten-box-1{ + @include pos(437px, 809px, 283px, 181px); + @include bg_pos("result/larnten-box-1.png"); + } + .larnten-box-2{ + @include pos(423px, 790px, 304px, 178px); + @include bg_pos("result/larnten-box-2.png"); + } + .larnten-box-3{ + @include pos(447px, 807px, 280px, 170px); + @include bg_pos("result/larnten-box-3.png"); } .larnten-1{ - // @include pos(609px, 878px, -54px, 267px); - // @include bg_pos("result/larnten-1.png"); + @include pos(397px, 787px, 315px, 297px); + @include bg_pos("result/larnten-1.png"); } + .larnten-2{ + @include pos(444px, 771px, 306px, 302px); + @include bg_pos("result/larnten-2.png"); + } + + .larnten-3{ + @include pos(472px, 789px, 278px, 285px); + @include bg_pos("result/larnten-3.png"); + } + + .blessing-1-1{ - @include pos(86px, 565px, 119px, 409px); + @include pos(86px, 565px, 70px, 347px); @include bg_pos("result/blessing-text-1-1.png"); } .blessing-1-2{ - @include pos(82px, 561px, 214px, 409px); + @include pos(82px, 561px, 165px, 347px); @include bg_pos("result/blessing-text-1-2.png"); } .blessing-2-1{ - @include pos(86px, 563px, 119px, 409px); + @include pos(86px, 563px, 70px, 347px); @include bg_pos("result/blessing-text-2-1.png"); } .blessing-2-2{ - @include pos(88px, 565px, 214px, 409px); + @include pos(88px, 565px, 165px, 347px); @include bg_pos("result/blessing-text-2-2.png"); } .blessing-3-1{ - @include pos(86px, 568px, 119px, 409px); + @include pos(86px, 568px, 70px, 347px); @include bg_pos("result/blessing-text-3-1.png"); } .blessing-3-2{ - @include pos(87px, 563px, 214px, 409px); + @include pos(87px, 563px, 165px, 347px); @include bg_pos("result/blessing-text-3-2.png"); } .result-product{ - @include pos(659px, 159px, 45px, 1004px); + @include pos(619px, 138px, 65px, 1015px); } .product-1{ @include bg_pos("result/product-1.png"); @@ -207,12 +232,12 @@ const hideShare = () => { } .result-tips{ - @include pos(645px, 71px, 52px, 1195px); + @include pos(645px, 71px, 52px, 1183px); @include bg_pos("result/text.png"); } .create-poster{ - @include pos(237px, 80px, 257px, 1302px); + @include pos(237px, 80px, 257px, 1284px); @include bg_pos("result/create-btn.png"); } diff --git a/src/data/imgList.js b/src/data/imgList.js index bfb0d93..b94ac93 100644 --- a/src/data/imgList.js +++ b/src/data/imgList.js @@ -38,34 +38,35 @@ const page = [ 'qa/bg.jpg', 'qa/bottom-bg.png', + 'result/tips.png', + 'result/product-3.png', 'result/share-tips.svg', + 'result/text.png', + 'result/larnten-box-1.png', + 'result/larnten-box-2.png', + 'result/larnten-box-3.png', + 'result/poster-1.jpg', + 'result/poster-2.jpg', + 'result/poster-3.jpg', + 'result/preveiw-1.png', + 'result/preveiw-2.png', + 'result/preveiw-3.png', + 'result/product-1.png', + 'result/product-2.png', + 'result/blessing-text-1-1.png', + 'result/blessing-text-1-2.png', + 'result/blessing-text-2-1.png', + 'result/blessing-text-2-2.png', + 'result/blessing-text-3-1.png', + 'result/blessing-text-3-2.png', 'result/cls-btn.png', 'result/create-btn.png', 'result/go-draw-btn.png', 'result/go-share-btn.png', - 'result/blessing-text-1-2.png', - 'result/tips.png', - 'result/product-2.png', - 'result/blessing-text-3-1.png', - 'result/blessing-text-1-1.png', - 'result/blessing-text-2-1.png', - 'result/product-3.png', - 'result/blessing-text-3-2.png', - 'result/blessing-text-2-2.png', - 'result/product-1.png', - 'result/text.png', 'result/larnten-1.png', - 'result/larnten-3.png', 'result/larnten-2.png', - 'result/preveiw-1.png', - 'result/preveiw-2.png', - 'result/preveiw-3.png', + 'result/larnten-3.png', 'result/bg.jpg', - 'result/poster.jpg', - 'rule/cls-btn.png', - 'rule/icon.png', - 'rule/arrow.png', - 'rule/rule-box.png', ] diff --git a/src/page/Home/App.vue b/src/page/Home/App.vue index d051397..9410ea6 100644 --- a/src/page/Home/App.vue +++ b/src/page/Home/App.vue @@ -106,8 +106,6 @@ onMounted(() => { let code = getQueryString("code"); let url = import.meta.env.VITE_URL; - // console.log("code:", code); - // console.log("url:", url); let dev = import.meta.env.VITE_MODE; if (dev != "dev") { diff --git a/src/store/index.js b/src/store/index.js index c752f9c..3db64a4 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -7,7 +7,7 @@ export const useMainStore = defineStore("counter", { hasDraw: true, //是否有抽奖机会 token: '', posterId: 3, //测试结果 - hasPrize: true, //是否有奖品 + hasPrize: false, //是否有奖品 prizeCode: 'oggSVMbeLgSK', //兑换码 prizeMoney: '8.88', //金额 drawKey: '',