diff --git a/src/assets/font/AlimamaShuHeiTi.ttf b/src/assets/font/AlimamaShuHeiTi.ttf index 854c844..3990c33 100644 Binary files a/src/assets/font/AlimamaShuHeiTi.ttf and b/src/assets/font/AlimamaShuHeiTi.ttf differ diff --git a/src/assets/font/HYYakuHei-85W.ttf b/src/assets/font/HYYakuHei-85W.ttf index 0bb162c..a10bf7c 100644 Binary files a/src/assets/font/HYYakuHei-85W.ttf and b/src/assets/font/HYYakuHei-85W.ttf differ diff --git a/src/assets/font/SourceHanSansCN-Regular.ttf b/src/assets/font/SourceHanSansCN-Regular.ttf new file mode 100644 index 0000000..ed424aa Binary files /dev/null and b/src/assets/font/SourceHanSansCN-Regular.ttf differ diff --git a/src/assets/font/SourceHanSansCNMedium.ttf b/src/assets/font/SourceHanSansCNMedium.ttf new file mode 100644 index 0000000..dd67544 Binary files /dev/null and b/src/assets/font/SourceHanSansCNMedium.ttf differ diff --git a/src/assets/font/fzcy.ttf b/src/assets/font/fzcy.ttf index dbabeed..c528cb1 100644 Binary files a/src/assets/font/fzcy.ttf and b/src/assets/font/fzcy.ttf differ diff --git a/src/assets/font/fzzy.ttf b/src/assets/font/fzzy.ttf index f03a55a..d44c759 100644 Binary files a/src/assets/font/fzzy.ttf and b/src/assets/font/fzzy.ttf differ diff --git a/src/assets/font/源字体/AlimamaShuHeiTi.ttf b/src/assets/font/源字体/AlimamaShuHeiTi.ttf new file mode 100644 index 0000000..854c844 Binary files /dev/null and b/src/assets/font/源字体/AlimamaShuHeiTi.ttf differ diff --git a/src/assets/font/源字体/HYYakuHei-85W.ttf b/src/assets/font/源字体/HYYakuHei-85W.ttf new file mode 100644 index 0000000..0bb162c Binary files /dev/null and b/src/assets/font/源字体/HYYakuHei-85W.ttf differ diff --git a/src/assets/font/源字体/SourceHanSansCN Medium.ttf b/src/assets/font/源字体/SourceHanSansCN Medium.ttf new file mode 100644 index 0000000..24508e6 Binary files /dev/null and b/src/assets/font/源字体/SourceHanSansCN Medium.ttf differ diff --git a/src/assets/font/源字体/SourceHanSansCN-Regular.ttf b/src/assets/font/源字体/SourceHanSansCN-Regular.ttf new file mode 100644 index 0000000..53b6691 Binary files /dev/null and b/src/assets/font/源字体/SourceHanSansCN-Regular.ttf differ diff --git a/src/assets/font/源字体/fzcy.ttf b/src/assets/font/源字体/fzcy.ttf new file mode 100644 index 0000000..dbabeed Binary files /dev/null and b/src/assets/font/源字体/fzcy.ttf differ diff --git a/src/assets/font/源字体/fzzy.ttf b/src/assets/font/源字体/fzzy.ttf new file mode 100644 index 0000000..f03a55a Binary files /dev/null and b/src/assets/font/源字体/fzzy.ttf differ diff --git a/src/assets/images/index/bg.jpg b/src/assets/images/index/bg.jpg index 6934554..d20a454 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/prize-btn.png b/src/assets/images/index/prize-btn.png index 89e86aa..549516f 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 2b2499d..9b22bee 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 5e3bebb..b8de374 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 94ad95a..0504df1 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/load/bg.jpg b/src/assets/images/load/bg.jpg index 0b3e116..5b67850 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/clock-bg.png b/src/assets/images/load/clock-bg.png index d56f80b..905f189 100644 Binary files a/src/assets/images/load/clock-bg.png and b/src/assets/images/load/clock-bg.png differ diff --git a/src/assets/images/load/clock-circle.png b/src/assets/images/load/clock-circle.png index 5373ab4..fe6cb3a 100644 Binary files a/src/assets/images/load/clock-circle.png and b/src/assets/images/load/clock-circle.png differ diff --git a/src/assets/images/load/clock-hour.png b/src/assets/images/load/clock-hour.png index 027c1d0..ee87b2d 100644 Binary files a/src/assets/images/load/clock-hour.png and b/src/assets/images/load/clock-hour.png differ diff --git a/src/assets/images/load/clock-minute.png b/src/assets/images/load/clock-minute.png index f96b1af..f5d2ef7 100644 Binary files a/src/assets/images/load/clock-minute.png and b/src/assets/images/load/clock-minute.png differ diff --git a/src/assets/images/load/clock-second.png b/src/assets/images/load/clock-second.png index f1e6f55..ecc9c83 100644 Binary files a/src/assets/images/load/clock-second.png and b/src/assets/images/load/clock-second.png differ diff --git a/src/assets/images/music-off.png b/src/assets/images/music-off.png index 57bb954..68136f4 100644 Binary files a/src/assets/images/music-off.png and b/src/assets/images/music-off.png differ diff --git a/src/assets/images/music-on.png b/src/assets/images/music-on.png index d37588b..0becaed 100644 Binary files a/src/assets/images/music-on.png and b/src/assets/images/music-on.png differ diff --git a/src/assets/images/prize/cls-btn.png b/src/assets/images/prize/cls-btn.png index 5ee56b6..2810f36 100644 Binary files a/src/assets/images/prize/cls-btn.png and b/src/assets/images/prize/cls-btn.png differ diff --git a/src/assets/images/prize/copy-btn.png b/src/assets/images/prize/copy-btn.png index 7201210..a045425 100644 Binary files a/src/assets/images/prize/copy-btn.png and b/src/assets/images/prize/copy-btn.png differ diff --git a/src/assets/images/prize/draw-box.png b/src/assets/images/prize/draw-box.png index e795841..d7f64f6 100644 Binary files a/src/assets/images/prize/draw-box.png and b/src/assets/images/prize/draw-box.png differ diff --git a/src/assets/images/prize/light.png b/src/assets/images/prize/light.png index 5fea8f5..066c5ce 100644 Binary files a/src/assets/images/prize/light.png and b/src/assets/images/prize/light.png differ diff --git a/src/assets/images/prize/myPrize-box.png b/src/assets/images/prize/myPrize-box.png index 1d72494..a77c644 100644 Binary files a/src/assets/images/prize/myPrize-box.png and b/src/assets/images/prize/myPrize-box.png differ diff --git a/src/assets/images/prize/no-prize.png b/src/assets/images/prize/no-prize.png index b6625ae..fa0c016 100644 Binary files a/src/assets/images/prize/no-prize.png and b/src/assets/images/prize/no-prize.png differ diff --git a/src/assets/images/prize/star.png b/src/assets/images/prize/star.png index a2e01b3..7ae8cea 100644 Binary files a/src/assets/images/prize/star.png and b/src/assets/images/prize/star.png differ diff --git a/src/assets/images/qa/answer-box-1.png b/src/assets/images/qa/answer-box-1.png index 37601cc..09d3923 100644 Binary files a/src/assets/images/qa/answer-box-1.png and b/src/assets/images/qa/answer-box-1.png differ diff --git a/src/assets/images/qa/answer-box-2.png b/src/assets/images/qa/answer-box-2.png index a86ab1e..b8f2bde 100644 Binary files a/src/assets/images/qa/answer-box-2.png and b/src/assets/images/qa/answer-box-2.png differ diff --git a/src/assets/images/qa/prev-btn.png b/src/assets/images/qa/prev-btn.png index e2f5f75..7fdcc89 100644 Binary files a/src/assets/images/qa/prev-btn.png and b/src/assets/images/qa/prev-btn.png differ diff --git a/src/assets/images/qa/question.png b/src/assets/images/qa/question.png index e3205f3..bead0f1 100644 Binary files a/src/assets/images/qa/question.png and b/src/assets/images/qa/question.png differ diff --git a/src/assets/images/qa/showResult-btn.png b/src/assets/images/qa/showResult-btn.png index 3cd6ee9..3fa4577 100644 Binary files a/src/assets/images/qa/showResult-btn.png and b/src/assets/images/qa/showResult-btn.png differ diff --git a/src/assets/images/result/bg-1.jpg b/src/assets/images/result/bg-1.jpg index 1d3198e..c98f260 100644 Binary files a/src/assets/images/result/bg-1.jpg and b/src/assets/images/result/bg-1.jpg differ diff --git a/src/assets/images/result/bg-2.jpg b/src/assets/images/result/bg-2.jpg index 6079681..fc3cd56 100644 Binary files a/src/assets/images/result/bg-2.jpg and b/src/assets/images/result/bg-2.jpg differ diff --git a/src/assets/images/result/bg-3.jpg b/src/assets/images/result/bg-3.jpg index 4d13f25..bd6195a 100644 Binary files a/src/assets/images/result/bg-3.jpg and b/src/assets/images/result/bg-3.jpg differ diff --git a/src/assets/images/result/bg-4.jpg b/src/assets/images/result/bg-4.jpg index 081f270..2f7d499 100644 Binary files a/src/assets/images/result/bg-4.jpg and b/src/assets/images/result/bg-4.jpg differ diff --git a/src/assets/images/result/cls-btn.png b/src/assets/images/result/cls-btn.png index e478b09..cc6f2ee 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 7fbcd7a..5d58a8d 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 67fd45d..1a9d2ad 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 2b13357..6687796 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/poster-bg-1.jpg b/src/assets/images/result/poster-bg-1.jpg index 5c41775..5f9e252 100644 Binary files a/src/assets/images/result/poster-bg-1.jpg and b/src/assets/images/result/poster-bg-1.jpg differ diff --git a/src/assets/images/result/poster-bg-2.jpg b/src/assets/images/result/poster-bg-2.jpg index 8c05976..484713e 100644 Binary files a/src/assets/images/result/poster-bg-2.jpg and b/src/assets/images/result/poster-bg-2.jpg differ diff --git a/src/assets/images/result/poster-bg-3.jpg b/src/assets/images/result/poster-bg-3.jpg index 7b4dc26..069c56b 100644 Binary files a/src/assets/images/result/poster-bg-3.jpg and b/src/assets/images/result/poster-bg-3.jpg differ diff --git a/src/assets/images/result/poster-bg-4.jpg b/src/assets/images/result/poster-bg-4.jpg index 7b3402c..32d4d7b 100644 Binary files a/src/assets/images/result/poster-bg-4.jpg and b/src/assets/images/result/poster-bg-4.jpg differ diff --git a/src/assets/images/result/product-1.png b/src/assets/images/result/product-1.png index 0b6299a..883d60c 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/select-arrow.png b/src/assets/images/result/select-arrow.png index ce5102d..59b6690 100644 Binary files a/src/assets/images/result/select-arrow.png and b/src/assets/images/result/select-arrow.png differ diff --git a/src/assets/images/result/theme-1.png b/src/assets/images/result/theme-1.png index bd431e9..784a860 100644 Binary files a/src/assets/images/result/theme-1.png and b/src/assets/images/result/theme-1.png differ diff --git a/src/assets/images/result/theme-2.png b/src/assets/images/result/theme-2.png index a113baf..a084155 100644 Binary files a/src/assets/images/result/theme-2.png and b/src/assets/images/result/theme-2.png differ diff --git a/src/assets/images/result/theme-3.png b/src/assets/images/result/theme-3.png index e2d0521..13d4470 100644 Binary files a/src/assets/images/result/theme-3.png and b/src/assets/images/result/theme-3.png differ diff --git a/src/assets/images/result/theme-4.png b/src/assets/images/result/theme-4.png index dfe1962..34070c0 100644 Binary files a/src/assets/images/result/theme-4.png and b/src/assets/images/result/theme-4.png differ diff --git a/src/assets/images/rule/arrow.png b/src/assets/images/rule/arrow.png index 9619845..6666c92 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/caidai.png b/src/assets/images/rule/caidai.png index 0107643..fbfe521 100644 Binary files a/src/assets/images/rule/caidai.png and b/src/assets/images/rule/caidai.png differ diff --git a/src/assets/images/rule/cls-btn.png b/src/assets/images/rule/cls-btn.png index d8bf229..71b9ed2 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/rule-box.png b/src/assets/images/rule/rule-box.png index c50fead..7c2d84f 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/assets/images/share.jpg b/src/assets/images/share.jpg index bcfb777..0cbbab1 100644 Binary files a/src/assets/images/share.jpg and b/src/assets/images/share.jpg differ diff --git a/src/components/Index.vue b/src/components/Index.vue index 9baf4d1..2afc3ae 100644 --- a/src/components/Index.vue +++ b/src/components/Index.vue @@ -175,15 +175,18 @@ onMounted(() => { } .index-agreement { + font-family: "SourceHanSansCN"; pointer-events: none; - @include pos(736px, 172px, 7px, 1219px); + @include pos(736px, 182px, 7px, 1219px); background: rgba($color: #f49e6a, $alpha: 0.55); font-size: 14px; text-align: justify; + letter-spacing: 0.1px; color: #000000; padding: 10px; box-sizing: border-box; border-radius: 10px; + line-height: 20px; .b { font-weight: 700; @@ -191,6 +194,7 @@ onMounted(() => { .orange { color: #ea5404; + font-weight: 700; } } } diff --git a/src/components/Question.vue b/src/components/Question.vue index 86f4342..a1a35b9 100644 --- a/src/components/Question.vue +++ b/src/components/Question.vue @@ -299,6 +299,7 @@ onMounted(() => { @include flexCen(); .question { + font-family: "alimama"; position: relative; @include box(713px, 428px); @include bg_pos("qa/question.png"); @@ -322,8 +323,9 @@ onMounted(() => { justify-content: center; align-items: center; font-size: 40px; - font-weight: 700; + // font-weight: 700; // line-height: 50px; + font-family: "alimama"; .text { width: 90%; @@ -367,33 +369,11 @@ onMounted(() => { @include box(367px, 357px); padding: 10px; border-radius: 50%; - + font-family: "SourceHanSansCNMedium"; font-size: 35px; font-weight: 700; border-radius: 50%; - // .content-before { - // pointer-events: none; - // float: left; - // width: 50%; - // height: 100%; - // shape-outside: radial-gradient( - // farthest-side ellipse at right, - // transparent 98%, - // red - // ); - // } - // .content-after { - // pointer-events: none; - // float: right; - // width: 50%; - // height: 100%; - // shape-outside: radial-gradient( - // farthest-side ellipse at left, - // transparent 98%, - // red - // ); - // } .text { @include box(367px, 357px); padding: 0px 20px; diff --git a/src/components/Result.vue b/src/components/Result.vue index e199d9d..abb9840 100644 --- a/src/components/Result.vue +++ b/src/components/Result.vue @@ -107,90 +107,86 @@ onMounted(() => { const createPoster = (event) => { let e = event.target; - debounceTap( - e, - () => { - // 海报生成 - posterCreate( - { width: 750, height: 1500 }, //海报尺寸 - // 海报素材,按顺序依次渲染 - [ - // 背景 - { - name: "bg", - src: posterBg[bgId.value - 1], - pos: { w: 750, h: 1500, x: 0, y: 0 }, + debounceTap(e, () => { + // 海报生成 + posterCreate( + { width: 750, height: 1500 }, //海报尺寸 + // 海报素材,按顺序依次渲染 + [ + // 背景 + { + name: "bg", + src: posterBg[bgId.value - 1], + pos: { w: 750, h: 1500, x: 0, y: 0 }, + }, + // 产品 + { + name: "product", + src: mbtiObj.value.productPic, + pos: { w: 469, h: 102, x: 137, y: 911 }, + }, + // 二维码 + { + name: "eqcode", + src: eqcodePic.value, + pos: { w: 140, h: 140, x: 66, y: 1070 }, + }, + ], + // 字体素材 + [ + // mbti title及职业 + { + content: mbtiObj.value.type + " " + mbtiObj.value.job, + style: { + font: "normal 80px HYYakuHei", + pos: { x: 70, y: 340 }, }, - // 产品 - { - name: "product", - src: mbtiObj.value.productPic, - pos: { w: 469, h: 102, x: 137, y: 911 }, + }, + // mbti 描述 + { + content: mbtiObj.value.des[0], + style: { + font: "normal 30px fzzy", + color: "#af6f49", + pos: { x: 70, y: 470 }, }, - // 二维码 - { - name: "eqcode", - src: eqcodePic.value, - pos: { w: 140, h: 140, x: 66, y: 1070 }, + }, + { + content: mbtiObj.value.des[1], + style: { + font: "normal 30px fzzy", + color: "#af6f49", + pos: { x: 70, y: 520 }, }, - ], - // 字体素材 - [ - // mbti title及职业 - { - content: mbtiObj.value.type + " " + mbtiObj.value.job, - style: { - font: "normal 80px HYYakuHei", - pos: { x: 70, y: 330 }, - }, + }, + // 新年寄语 + { + content: mbtiObj.value.blessings[0], + style: { + font: "normal 50px fzcy", + pos: { x: 70, y: 650 }, }, - // mbti 描述 - { - content: mbtiObj.value.des[0], - style: { - font: "normal 30px fzzy", - color: "#af6f49", - pos: { x: 70, y: 470 }, - }, + }, + { + content: mbtiObj.value.blessings[1], + style: { + font: "normal 50px fzcy", + pos: { x: 70, y: 725 }, }, - { - content: mbtiObj.value.des[1], - style: { - font: "normal 30px fzzy", - color: "#af6f49", - pos: { x: 70, y: 520 }, - }, + }, + // 产品 + { + content: mbtiObj.value.product, + style: { + font: "normal 50px fzcy", + pos: { x: 70, y: 876 }, }, - // 新年寄语 - { - content: mbtiObj.value.blessings[0], - style: { - font: "normal 50px fzcy", - pos: { x: 70, y: 650 }, - }, - }, - { - content: mbtiObj.value.blessings[1], - style: { - font: "normal 50px fzcy", - pos: { x: 70, y: 725 }, - }, - }, - // 产品 - { - content: mbtiObj.value.product, - style: { - font: "normal 50px fzcy", - pos: { x: 70, y: 876 }, - }, - }, - ], - // 主题配色 - theme[bgId.value - 1] - ); - }, - 0.4 - ); + }, + ], + // 主题配色 + theme[bgId.value - 1] + ); + }); }; const goDraw = (event) => { diff --git a/src/data/index.js b/src/data/index.js index f2caf5d..97fee04 100644 --- a/src/data/index.js +++ b/src/data/index.js @@ -130,7 +130,7 @@ export const data = [ }, { aid: 'B', - text: 'B.保持灵活性,根据市场的最新变化调整你的投资策略', + text: '保持灵活性,根据市场的最新变化调整你的投资策略', secore: 'P', }, ], diff --git a/src/page/Home/App.vue b/src/page/Home/App.vue index e23be9c..0684125 100644 --- a/src/page/Home/App.vue +++ b/src/page/Home/App.vue @@ -77,7 +77,7 @@ const drawFn = (item) => { } }; -const showResult = ref(false); +const showResult = ref(true); const resultFn = (item) => { if (item.action == "hide") { showResult.value = false; @@ -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); diff --git a/src/styles/global.scss b/src/styles/global.scss index abf1834..4571bcd 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -64,6 +64,17 @@ body { src: url(@/assets/font/fzzy.ttf) format("truetype"); } +@font-face { + font-family: "SourceHanSansCN"; + src: url(@/assets/font/SourceHanSansCN-Regular.ttf) format("truetype"); +} + +@font-face { + font-family: "SourceHanSansCNMedium"; + src: url(@/assets/font/SourceHanSansCNMedium.ttf) format("truetype"); +} +SourceHanSansCN Medium + * { padding: 0; margin: 0; diff --git a/字体压缩.txt b/字体压缩.txt new file mode 100644 index 0000000..3258d6d --- /dev/null +++ b/字体压缩.txt @@ -0,0 +1,257 @@ +1、fzcy +