feat: bug fix

pages/report/component/FirstStyleType/SensoryTypes.vue

@@ -14,17 +14,17 @@ const props = defineProps({
 const json = ref( [
   {
     type: '0',
-    value: '曲线型',
+    value: '轮廓偏曲',
     desc: '面部五官线条（眉眼、嘴唇等）没有特别强烈的曲线感或直线硬朗感，面部轮廓、发型线条以及穿着的服装（V 领、简洁款式 ）也呈现出既非极端曲线柔和，也非极端直线利落的状态，是较为平衡的直曲适中风格 。'
   },
   {
     type: '1',
-    value: '曲直适中',
+    value: '轮廓适中',
     desc: '面部五官线条（眉眼、嘴唇等）没有特别强烈的曲线感或直线硬朗感，面部轮廓、发型线条以及穿着的服装（V 领、简洁款式 ）也呈现出既非极端曲线柔和，也非极端直线利落的状态，是较为平衡的直曲适中风格 。'
   },
   {
     type: '2',
-    value: '直线型',
+    value: '轮廓偏直',
     desc: '面部五官线条（眉眼、嘴唇等）没有特别强烈的曲线感或直线硬朗感，面部轮廓、发型线条以及穿着的服装（V 领、简洁款式 ）也呈现出既非极端曲线柔和，也非极端直线利落的状态，是较为平衡的直曲适中风格 。'
   }
 ])

pages/report/index.vue

@@ -1,13 +1,13 @@
 <template>
   <view style="overflow-x: hidden; font-size: 0">
 
-    <img v-if="isInPptr" src="/static/header.png" style="width: 100%;display: block;margin-bottom: -138rpx;" />
+    <img v-if="isInPptr" src="/static/header.png" style="width: 100%;display: block;margin-bottom: -600rpx;" />
 
     <view id="headerBox">
       <!-- <Header v-if="!!userFaceInfo" :userFaceInfo="userFaceInfo" /> -->
       <Header v-if="collect" :userFaceInfo="collect" />
 
-      <view class="download" @click="openEmailDialog">
+      <view class="download" @click="openEmailDialog" v-if="!isInPptr">
         <view class="download-left">
           <img src="/static/pdf-icon.png" class="pdf-icon" />
         </view>
@@ -16,14 +16,14 @@
         <view class="download-right">确定</view>
       </view>
 
-      <view class="report">
+      <!-- <view class="report">
         <view class="report-title"> 美学诊断报告 </view>
         <view class="report-title-en"> FD Aesthetic Diagnosis Report </view>
-      </view>
+      </view> -->
     </view>
 
 
-    <view style="display: block;">
+    <view style="display: block;background-color: white;position: relative;z-index: 2;" v-if="isInPptr">
       <img src="/static/nav-1.png" style="width: 100%;display: block;" />
       <img src="/static/nav-2.png" style="width: 100%;display: block;" />
     </view>
@@ -42,7 +42,7 @@
       }"
       v-if="collect"
     >
-      <view v-if="activeTab === 0">
+      <view v-if="isInPptr ? true : activeTab === 0">
         <view class="style-type">
           <!--
           基因风格
@@ -84,13 +84,13 @@
           <template v-if="customFigure">
             <SensoryTypes
               :type="collect.straight_total_score_t"
-              :ai-desc="customFigure?.sensory?.desc"
+              :ai-desc="customFigure?.contour?.desc"
             />
 
             <!--          量感类型-->
             <TypeOfMass
               :type="collect.total_sense_of_quantity_t"
-              :ai-desc="customFigure?.mass?.desc"
+              :ai-desc="customFigure?.quantity?.desc"
             />
             <!-- <h1>动静类型</h1> -->
             <!--          动静类型-->
@@ -118,7 +118,8 @@
           </template>
         </view>
       </view>
-      <view v-else-if="activeTab === 1">
+
+      <view v-if="isInPptr ? true :activeTab === 1">
         <view class="style-type">
           <view class="title">四季色彩定位</view>
           <view class="swiper-container">
@@ -214,7 +215,7 @@
         </view>
       </view>
       <!-- 依此类推 -->
-      <view v-else-if="activeTab === 2">
+      <view v-if="isInPptr ? true : activeTab === 2">
         <view class="style-type">
           <view class="avatar-warp">
             <view
@@ -266,7 +267,7 @@
           </view>
         </view>
       </view>
-      <view v-else-if="activeTab === 3">
+      <view v-if="isInPptr ? true :activeTab === 3">
         <view class="style-type" style="overflow-y: hidden">
           <view class="lucky-color-box" style="overflow-y: hidden">
             <view class="shengxiao">
@@ -437,10 +438,11 @@
       const { data } = JSON.parse(res2.result[0].thridResp);
 
       const target = Object.assign({}, JSON.parse(res1.data.dataJson), data.face_figure, {
-        avatar_img_url: res3.data.avatar || 'https://puton.huimeimeta.com/imgs/default_avatar.png',
+        // avatar_img_url: res3.data.avatar || 'https://puton.huimeimeta.com/imgs/default_avatar.png',
         firstImageUrl,
         secondImageUrl,
-        thirdImageUrl
+        thirdImageUrl,
+        avatar_img_url: options.img
       });
 
       target.gender = target.sex;