合并冲突

src/views/hzyb/components/SharePoster.vue

@@ -52,8 +52,8 @@ const handleCreatePoster=async ()=>{
         bottom: 100px;
         right: 34px;
         z-index: 50;
-        width: 76px;
-        height: 76px;
+        width: 100px;
+        height: 100px;
     }
     .chart-icon{
         float: right;

src/views/hzyb/report/ChapterDetail.vue

@@ -18,7 +18,7 @@
             <span style="color: #e3b377; margin-left: 20px" @click="showDisclaimers = true">免责声明</span>
           </div>
         </div>
-        <img class="ppt-icon" v-if="hasPPt" @click="goPPtDetail" src="@/assets/hzyb/report/ppt-icon.png" alt="">
+        <img class="ppt-icon" style="bottom:185px" v-if="hasPPt" @click="goPPtDetail" src="@/assets/hzyb/report/ppt-icon.png" alt="">
       </div>
       <div class="rich-content" ref="richConBox">
         <div v-if="info.auth_ok">
@@ -195,6 +195,7 @@ export default {
       hasPPt:false,
 
       userInfo:null,
+      shareData:{},//分享的数据传给ppt页
     };
   },
   beforeCreate(){
@@ -247,8 +248,12 @@ export default {
     // },
     //跳转ppt预览页
     goPPtDetail(){
+        const report_id=this.info.report_chapter_item.report_id
+        const chapterId=this.info.report_chapter_item.report_chapter_id
+        const shareImg=this.shareData.shareImg
+        const shareTitle=this.shareData.title
         wx.miniProgram.navigateTo({
-            url:`/pages-report/previewImage?reportId=${this.info.report_chapter_item.report_id}&chapterId=${this.info.report_chapter_item.report_chapter_id}`
+            url:`/pages-report/previewImage?reportId=${report_id}&chapterId=${chapterId}&shareImg=${shareImg}&shareTitle=${shareTitle}`
         })
     },
 
@@ -331,6 +336,11 @@ export default {
         if(rddpImgRes.code===200){
             shareImg=rddpImgRes.data
         }
+        this.shareData={
+          title:shareTitle,
+          chapterId:this.chapterId,
+          shareImg:shareImg
+        }
         wx.miniProgram.postMessage({ 
           data: {
             title:shareTitle,
@@ -612,10 +622,12 @@ export default {
             line-height: 1.5;
         }
         .ppt-icon{
-            position: absolute;
-            bottom: 14px;
-            right: 10px;
-            width: 40px;
+            position: fixed;
+            bottom: 250px;
+            right: 34px;
+            width: 100px;
+            height: 100px;
+            z-index: 50;
         }
     }
 
@@ -678,10 +690,10 @@ export default {
     .back-top-img{
         position: fixed;
         z-index: 99;
-        width: 76px;
-        height: 76px;
+        width: 100px;
+        height: 100px;
         right: 34px;
-        bottom: 150px;
+        bottom: 130px;
     }
     .chapter-list-wrap {
     background-color: #f5f6fa;

src/views/hzyb/report/Detail.vue

@@ -63,7 +63,7 @@
                         <span style="color:#E3B377;margin-left:20px" @click="showDisclaimers=true">免责声明</span>
                     </div>
                 </div>
-                <img class="ppt-icon" v-if="hasPPt" @click="goPPtDetail" src="@/assets/hzyb/report/ppt-icon.png" alt="">
+                <img class="ppt-icon" style="bottom:185px" v-if="hasPPt" @click="goPPtDetail" src="@/assets/hzyb/report/ppt-icon.png" alt="">
             </div>
 
             <div class="rich-content" style="position: relative;" ref="richConBox">
@@ -204,6 +204,7 @@ export default {
             hasPPt:false,//是否有ppt
 
             userInfo:null,
+            shareData:{},//分享的数据传给ppt页
         }
     },
     beforeCreate(){
@@ -256,7 +257,7 @@ export default {
         //跳转ppt预览页
         goPPtDetail(){
             wx.miniProgram.navigateTo({
-                url:`/pages-report/previewImage?reportId=${this.reportId}&chapterId=0`
+                url:`/pages-report/previewImage?reportId=${this.reportId}&chapterId=0&shareImg=${this.shareData.shareImg}&shareTitle=${this.shareData.title}`,
             })
         },
 
@@ -378,6 +379,11 @@ export default {
                 if(rddpImgRes.code===200){
                     shareImg=rddpImgRes.data
                 }
+                this.shareData={
+                    title:shareTitle,
+                    reportId:this.reportId,
+                    shareImg:shareImg
+                }
 
                 wx.miniProgram.postMessage({ 
                     data: {
@@ -657,10 +663,12 @@ export default {
             line-height: 1.5;
         }
         .ppt-icon{
-            position: absolute;
-            bottom: 14px;
-            right: 10px;
-            width: 40px;
+            position: fixed;
+            bottom: 250px;
+            right: 34px;
+            width: 100px;
+            height: 100px;
+            z-index: 50;
         }
     }
 
@@ -723,10 +731,10 @@ export default {
     .back-top-img{
         position: fixed;
         z-index: 99;
-        width: 76px;
-        height: 76px;
+        width: 100px;
+        height: 100px;
         right: 34px;
-        bottom: 150px;
+        bottom: 130px;
     }
 
     .chapter-list-wrap{