From acd70b055bca23993504c3239a2af23761e74bd5 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 31 May 2022 18:56:37 +0800
Subject: [PATCH] bug

---
 src/saas/AppCountryAlbum/Watermark.vue        |  3 +-
 .../components/report/RenderContent.vue       | 51 +++++++++++--------
 .../components/report/WorkReport.vue          |  1 +
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index db73c562..a7bc6398 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -577,7 +577,8 @@
       overflow: hidden;
 
       .waterMarker-img {
-        width: 100%;
+        max-width: 100%;
+        object-fit: cover;
         max-height: calc(100vh - 321px - 128px);
       }
 
diff --git a/src/saas/AppCountryAlbum/components/report/RenderContent.vue b/src/saas/AppCountryAlbum/components/report/RenderContent.vue
index 2bee4977..35248cce 100644
--- a/src/saas/AppCountryAlbum/components/report/RenderContent.vue
+++ b/src/saas/AppCountryAlbum/components/report/RenderContent.vue
@@ -9,26 +9,28 @@
       <p v-if="item.type === 'text'">{{ item.value }}</p>
       <image v-else mode="widthFix" :src="item.value" />
     </div>
-    <div class="rich-bottom" :class="[isShow ? 'active' : '']">
-      <div class="top">
-        <h2>{{ type === 'text' ? '编辑文本' : '编辑图片' }}</h2>
-        <image @click="isShow = false, currIndex = -1" src="../../images/down_boldw.png" />
-      </div>
-      <div class="btns">
-        <div class="btn-item" hover-class="bg-hover" @click="remove">
-          <image src="../../images/remove-black.png" />
-          <span>删除</span>
+    <u-popup v-model="isShow" z-index="11" :closeable="false" border-radius="32" mode="bottom" @close="onClose">
+      <div class="rich-bottom">
+        <div class="top">
+          <h2>{{ type === 'text' ? '编辑文本' : '编辑图片' }}</h2>
+          <image @click="isShow = false, currIndex = -1" src="../../images/down_boldw.png" />
         </div>
-        <div class="btn-item" hover-class="bg-hover" v-if="type === 'text'" @click="toEditText">
-          <image src="../../images/xiugai.png" />
-          <span>修改</span>
-        </div>
-        <div class="btn-item" hover-class="bg-hover" @click="toClipping" v-else>
-          <image src="../../images/jiancai.png" />
-          <span>剪裁</span>
+        <div class="btns">
+          <div class="btn-item" hover-class="bg-hover" @click="remove">
+            <image src="../../images/remove-black.png" />
+            <span>删除</span>
+          </div>
+          <div class="btn-item" hover-class="bg-hover" v-if="type === 'text'" @click="toEditText">
+            <image src="../../images/xiugai.png" />
+            <span>修改</span>
+          </div>
+          <div class="btn-item" hover-class="bg-hover" @click="toClipping" v-else>
+            <image src="../../images/jiancai.png" />
+            <span>剪裁</span>
+          </div>
         </div>
       </div>
-    </div>
+    </u-popup>
   </div>
 </template>
 
@@ -46,6 +48,10 @@
       }
     },
 
+    onShow () {
+      this.isShow = false
+    },
+
     mounted () {
       uni.$on('cropper', e => {
         this.$emit('onLongpress', {
@@ -72,6 +78,11 @@
         this.isShow = false
       },
 
+      onClose () {
+        this.isShow = false
+        this.currIndex = -1
+      },
+
       remove () {
         this.$confirm('确定删除该条数据？').then(() => {
           this.$emit('onLongpress', {
@@ -91,8 +102,6 @@
         uni.navigateTo({
           url: `./Clipping?url=${encodeURIComponent(this.value)}`
         })
-
-        this.isShow = false
       },
 
       onLongpress (item, index) {
@@ -120,12 +129,12 @@
     }
 
     .rich-bottom {
-      position: fixed;
+      // position: fixed;
       bottom: 0;
       left: 0;
       z-index: 11;
       width: 100%;
-      transform: translateY(100%);
+      // transform: translateY(100%);
       border-radius: 32px 32px 0px 0px;
       transition: all ease 0.4s;
       overflow: hidden;
diff --git a/src/saas/AppCountryAlbum/components/report/WorkReport.vue b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
index 0f9fce9e..86174799 100644
--- a/src/saas/AppCountryAlbum/components/report/WorkReport.vue
+++ b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
@@ -144,6 +144,7 @@
 
           this.isShowText = true
         } else {
+          console.log(e)
           this.richList[e.index].value = e.value
         }
       },