-
-
-
-
+
\ No newline at end of file
diff --git a/src/components/Result.vue b/src/components/Result.vue
index b26e3bb..533ce2c 100644
--- a/src/components/Result.vue
+++ b/src/components/Result.vue
@@ -6,6 +6,7 @@ import { mbtiList } from "@/data";
import { posterCreate } from "@/plugins";
import { Toast } from "vant";
import QRCode from "qrcode";
+import { reactive } from "vue";
// 页面配置初始化
const emit = defineEmits(["ResultPage"]);
@@ -22,6 +23,12 @@ const bgPic = computed(() => {
const theme = reactive(["#d3473a", "#fb7700", "#4172d8", "#eb5c37"]);
const mbti = ref(userStore.MBTI);
const mbtiObj = ref(mbtiList.find((item) => item.type == mbti.value));
+const posterBg = reactive([
+ new URL("@/assets/images/result/poster-bg-1.jpg", import.meta.url).href,
+ new URL("@/assets/images/result/poster-bg-2.jpg", import.meta.url).href,
+ new URL("@/assets/images/result/poster-bg-3.jpg", import.meta.url).href,
+ new URL("@/assets/images/result/poster-bg-4.jpg", import.meta.url).href,
+]);
const changBg = (event, number) => {
let e = event.target;
@@ -64,10 +71,7 @@ const createPoster = (event) => {
// 背景
{
name: "bg",
- src: new URL(
- "../assets/images/result/poster-bg-" + bgId.value + ".jpg",
- import.meta.url
- ).href,
+ src: posterBg[bgId.value - 1],
pos: { w: 750, h: 1500, x: 0, y: 0 },
},
// 产品
@@ -87,7 +91,7 @@ const createPoster = (event) => {
[
// mbti title及职业
{
- content: mbtiObj.value.type + mbtiObj.value.job,
+ content: mbtiObj.value.type + " " + mbtiObj.value.job,
style: {
font: "normal 80px HYYakuHei",
pos: { x: 70, y: 330 },
@@ -221,6 +225,7 @@ const hideShare = () => {
+
*长按保存海报
@@ -419,6 +424,15 @@ const hideShare = () => {
}
}
+ .save-tips {
+ font-size: 20px;
+ font-family: "fzcy";
+ line-height: 20px;
+ margin-top: 20px;
+ color: #fff;
+ letter-spacing: 2px;
+ }
+
.poster-box {
@include box(495px, 990px);
margin-top: 20px;
diff --git a/src/data/imgList.js b/src/data/imgList.js
index 7fdadc4..e64259f 100644
--- a/src/data/imgList.js
+++ b/src/data/imgList.js
@@ -9,22 +9,52 @@ const load = [
]
const page = [
+
+ 'prize/tips.png',
+ 'prize/star.png',
+ 'prize/cls-btn.png',
+ 'prize/copy-btn.png',
+ 'prize/draw-box.png',
+ 'prize/draw-text.png',
+ 'prize/light.png',
+ 'prize/myPrize-box.png',
+ 'prize/no-prize.png',
+ 'music-on.png',
+ 'music-off.png',
'index/title.png',
'index/start-btn.png',
'index/rule-btn.png',
'index/prize-btn.png',
'index/bg.jpg',
- 'prize/myPrize-box.png',
- 'prize/copy-btn.png',
- 'prize/cls-btn.png',
'qa/showResult-btn.png',
'qa/question.png',
'qa/prev-btn.png',
'qa/answer-box-2.png',
'qa/answer-box-1.png',
- 'music-off.png',
- 'music-on.png',
-
+ 'result/theme-4.png',
+ 'result/theme-3.png',
+ 'result/theme-2.png',
+ 'result/theme-1.png',
+ 'result/share-tips.svg',
+ 'result/select-tips.png',
+ 'result/product-1.png',
+ 'result/select-arrow.png',
+ 'result/poster-bg-4.jpg',
+ 'result/poster-bg-3.jpg',
+ 'result/poster-bg-2.jpg',
+ 'result/poster-bg-1.jpg',
+ 'result/go-share-btn.png',
+ 'result/go-draw-btn.png',
+ 'result/create-btn.png',
+ 'result/bg-4.jpg',
+ 'result/cls-btn.png',
+ 'result/bg-2.jpg',
+ 'result/bg-3.jpg',
+ 'result/bg-1.jpg',
+ 'rule/rule-box.png',
+ 'rule/cls-btn.png',
+ 'rule/caidai.png',
+ 'rule/arrow.png',
]
diff --git a/src/page/Home/App.vue b/src/page/Home/App.vue
index e23be9c..dad6fb8 100644
--- a/src/page/Home/App.vue
+++ b/src/page/Home/App.vue
@@ -97,8 +97,8 @@ const ruleFn = (item) => {
onMounted(() => {
let code = getQueryString("code");
let url = import.meta.env.VITE_URL;
- console.log("code:", code);
- console.log("url:", url);
+ // console.log("code:", code);
+ // console.log("url:", url);
let dev = import.meta.env.VITE_MODE;
if (dev != "dev") {
@@ -112,7 +112,7 @@ onMounted(() => {
showLoad.value = true;
return;
} else {
- authorize({ scopeType: 1,redirectUri:url }).then((res) => {
+ authorize({ scopeType: 1, redirectUri: url }).then((res) => {
if (res.code == 0) {
console.log("重定向地址:", res.data);
location.replace(res.data);
@@ -149,7 +149,7 @@ onMounted(() => {
}
});
} else {
- authorize({ scopeType: 1,redirectUri:url }).then((res) => {
+ authorize({ scopeType: 1, redirectUri: url }).then((res) => {
if (res.code == 0) {
console.log("重定向地址:", res.data);
location.replace(res.data);