diff --git a/constant/aiText.js b/constant/aiText.js
index 69f0a1f..a3037fc 100644
--- a/constant/aiText.js
+++ b/constant/aiText.js
@@ -171,7 +171,10 @@ export const shengxiaoSystem_prompt = `五行八卦中年柱、月柱、日柱
• 注意闰年:需要注意的是,如果出生年份是闰年,2月有29天,在计算天数序号时要相应调整。闰年的判断方法是:能被4整除但不能被100整除的年份为闰年,此外能被400整除的年份也是闰年 。例如,2024年是闰年,计算当年天数序号时,2月按29天计算。
-年柱、月柱和日柱的计算规则虽然复杂,但它们蕴含着古人对时间和命运的深刻理解,是五行八卦命理学的重要基础 。`;
+年柱、月柱和日柱的计算规则虽然复杂,但它们蕴含着古人对时间和命运的深刻理解,是五行八卦命理学的重要基础 。
+
+特别注意:不需要多余的换行符,比如额外多余的\n,请直接返回文本内容
+`;
export const statureText = (
customKey,
diff --git a/pages/report/component/FirstStyleType/BodyType.vue b/pages/report/component/FirstStyleType/BodyType.vue
index af18e0a..3ccb887 100644
--- a/pages/report/component/FirstStyleType/BodyType.vue
+++ b/pages/report/component/FirstStyleType/BodyType.vue
@@ -98,7 +98,7 @@ watch(
{{ item.type }}
-
+
@@ -109,5 +109,6 @@ watch(
.figure {
margin-top: 26px;
margin-bottom: 12px;
+ width: 100%;
}
diff --git a/pages/report/component/FirstStyleType/BottomPic.vue b/pages/report/component/FirstStyleType/BottomPic.vue
index 8f8233d..30bce8b 100644
--- a/pages/report/component/FirstStyleType/BottomPic.vue
+++ b/pages/report/component/FirstStyleType/BottomPic.vue
@@ -49,38 +49,36 @@ watch(
-
+
-
+
+
心理风格
-
+ >
-
+ >
注:人工智能大模型在计算中可能存在0.5%的误差。
-
+ >
diff --git a/pages/report/component/FirstStyleType/geneticStyle.vue b/pages/report/component/FirstStyleType/geneticStyle.vue
index 0af2b9b..78326da 100644
--- a/pages/report/component/FirstStyleType/geneticStyle.vue
+++ b/pages/report/component/FirstStyleType/geneticStyle.vue
@@ -1,57 +1,56 @@
@@ -70,9 +69,17 @@ const closePreview = (e) => {
:key="index"
:src="pic"
class="pic"
- mode="aspectFill"
+ mode="widthFix"
@click="previewImage(pic)"
>
+
+
@@ -82,66 +89,66 @@ const closePreview = (e) => {
:src="currentPreviewImage"
class="preview-image"
mode="widthFix"
- @click="closePreview"
+ @click="closePreview"
>
\ No newline at end of file
+ .preview-image {
+ max-width: 100%;
+ max-height: 100%;
+ border-radius: 4px;
+ }
+
diff --git a/pages/report/index.vue b/pages/report/index.vue
index 4011e48..edccdfb 100644
--- a/pages/report/index.vue
+++ b/pages/report/index.vue
@@ -1,5 +1,7 @@
-
+
@@ -117,11 +119,11 @@
-
+ />
@@ -230,7 +232,7 @@
:key="index"
:class="index === 1 ? 'avatar-main' : 'avatar-side'"
>
-
+
@@ -246,8 +248,9 @@
height: collect?.gender === '男' ? '150px' : '328px',
}"
class="face-img-box"
+ style="margin: 0 auto;"
>
-
+
@@ -277,14 +280,12 @@
-
+
{{ numToChinese(shengxiaoNumList[0]) }}
{{ numToChinese(shengxiaoNumList[1]) }}
- {{
+ {{
numToChinese(shengxiaoNumList[2])
}}
{{ numToChinese(shengxiaoNumList[3]) }}
{{ numToChinese(shengxiaoNumList[4]) }}
+
+
-
+
-
+ >
@@ -1191,7 +1193,7 @@
}
.reference-img-box {
- height: 195.5px;
+ /* height: 195.5px; */
margin-top: 20px;
display: flex;
justify-content: space-between;
@@ -1200,7 +1202,8 @@
.reference-img-box .reference-img1 {
width: 100%;
- height: 195.5px;
+ /* height: 195.5px; */
+ object-fit: scale-down;
}
.reference-img-box .reference-img2 {
@@ -1226,17 +1229,19 @@
.avatar-warp {
width: 100%;
- height: 192px;
+ /* height: 192px; */
+ height: 50vw;
display: flex;
align-items: center;
justify-content: center;
}
.avatar-main {
- width: 116px;
- height: 160px;
- margin: 0 10px;
- border-radius: 40px;
+ /* width: 116px; */
+ /* height: 160px; */
+ height: 100%;
+ margin: 0 10rpx;
+ border-radius: 40rpx;
overflow: hidden;
}
@@ -1247,10 +1252,11 @@
}
.avatar-side {
- width: 80px;
- height: 120px;
+ /* width: 80px;
+ height: 120px; */
+ height: 80%;
/* background-color: yellow; */
- border-radius: 40px;
+ border-radius: 40rpx;
overflow: hidden;
}
@@ -1265,12 +1271,14 @@
}
.face-img-box {
- width: 336px;
- height: 338px;
+ /* width: 336px;
+ width: 50vw; */
+ text-align: center;
+ /* height: 338px; */
}
.face-img-box img {
- width: 100%;
+ /* width: 100%; */
height: 100%;
/* border-radius: 8px; */
}
@@ -1294,7 +1302,7 @@
.shengxiao {
width: 100%;
- height: 283px;
+ /* height: 283px; */
}
.shengxiao img {
@@ -1308,8 +1316,8 @@
}
.numblock {
- width: 50px;
- height: 50px;
+ width: 100rpx;
+ height: 100rpx;
display: flex;
border-radius: 50%;
align-items: center;
@@ -1317,12 +1325,14 @@
position: absolute;
color: white;
z-index: 999;
+ font-size: 25rpx;
}
.five-attribute {
width: 100%;
/* height: 597px; */
position: relative;
+ /* opacity: 0; */
}
.five-attribute img {
@@ -1337,7 +1347,6 @@
top: 25%;
width: 66.5px;
height: 66.5px;
- background-color: red;
border-radius: 50%;
overflow: hidden;
border: 3.22px solid rgba(167, 178, 179, 1);
@@ -1345,7 +1354,7 @@
.avatorLogo img {
width: 100%;
- height: 100%;
+ /* height: 100%; */
object-fit: cover;
}
diff --git a/static/activity-left.png b/static/activity-left.png
index 62e3b83..427787b 100644
Binary files a/static/activity-left.png and b/static/activity-left.png differ
diff --git a/static/avantGarde.png b/static/avantGarde.png
index 68185a0..6a12724 100644
Binary files a/static/avantGarde.png and b/static/avantGarde.png differ
diff --git a/static/classical.png b/static/classical.png
index ea5d53a..692125e 100644
Binary files a/static/classical.png and b/static/classical.png differ
diff --git a/static/dramaType.png b/static/dramaType.png
index b888c9f..cf6d811 100644
Binary files a/static/dramaType.png and b/static/dramaType.png differ
diff --git a/static/elegant.png b/static/elegant.png
index c43c959..421938f 100644
Binary files a/static/elegant.png and b/static/elegant.png differ
diff --git a/static/girlShaped.png b/static/girlShaped.png
index 498de47..5c9cf50 100644
Binary files a/static/girlShaped.png and b/static/girlShaped.png differ
diff --git a/static/header.png b/static/header.png
index 8122645..82f5709 100644
Binary files a/static/header.png and b/static/header.png differ
diff --git a/static/imgs/login-bg.jpg b/static/imgs/login-bg.jpg
index 9fd3065..e0fea04 100644
Binary files a/static/imgs/login-bg.jpg and b/static/imgs/login-bg.jpg differ
diff --git a/static/imgs/main.png b/static/imgs/main.png
index 3bbaa6a..3517fa4 100644
Binary files a/static/imgs/main.png and b/static/imgs/main.png differ
diff --git a/static/imgs/new-header.png b/static/imgs/new-header.png
index 3bff2a3..7fcbebe 100644
Binary files a/static/imgs/new-header.png and b/static/imgs/new-header.png differ
diff --git a/static/imgs/site.png b/static/imgs/site.png
new file mode 100644
index 0000000..ecb8a32
Binary files /dev/null and b/static/imgs/site.png differ
diff --git a/static/natural.png b/static/natural.png
index 3963e0f..b171b7c 100644
Binary files a/static/natural.png and b/static/natural.png differ
diff --git a/static/romantic.png b/static/romantic.png
index 7c7159a..82142ea 100644
Binary files a/static/romantic.png and b/static/romantic.png differ
diff --git a/static/teenagerType.png b/static/teenagerType.png
index 12b5b5f..1e11461 100644
Binary files a/static/teenagerType.png and b/static/teenagerType.png differ
diff --git a/static/wise.png b/static/wise.png
index a0cda7e..e3a3b12 100644
Binary files a/static/wise.png and b/static/wise.png differ
diff --git a/static/yangtu.png b/static/yangtu.png
index 405b93a..8f9a6bd 100644
Binary files a/static/yangtu.png and b/static/yangtu.png differ
diff --git a/static/yifu.png b/static/yifu.png
index e80b91a..d11f21f 100644
Binary files a/static/yifu.png and b/static/yifu.png differ
diff --git a/static/yifu1.png b/static/yifu1.png
index d1ade79..aded710 100644
Binary files a/static/yifu1.png and b/static/yifu1.png differ