From 7d980490444c5fc490705c8d357c665854fe4144 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 31 May 2022 14:31:21 +0800
Subject: [PATCH] bug

---
 src/saas/AppCountryAlbum/Watermark.vue      |  52 +++++++++++++++++++-
 src/saas/AppCountryAlbum/images/close-b.png | Bin 0 -> 685 bytes
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/saas/AppCountryAlbum/images/close-b.png

diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index 21e7d785..89db85ab 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="photo" :class="[isHide ? 'home-active' : '']" :style="{height: height + 'px'}">
+  <div class="photo" :class="[isHide ? 'home-active' : '']" @click="isHide = true" :style="{height: height + 'px'}">
     <div class="photo-top" data-html2canvas-ignore>
       <div class="photo-top__middle" @click="isShowAlbum = true">
         <span>保存至：{{ albumName || '默认相册' }}</span>
@@ -15,6 +15,10 @@
         @touchstart="onTouchstart"
         @touchmove="onTouchmove">
         <component ref="WatermarkItem" :is="'Watermark' + (currIndex + 1)" :config="currWatermarkConfig"></component>
+        <div v-if="!isHide" @click.stop="currIndex = -1" class="watermark-close" data-html2canvas-ignore>
+          <image src="./images/close-b.png" />
+        </div>
+        <span v-if="!isHide" class="watermark-edit" @click.stop="toEdit" data-html2canvas-ignore>编辑</span>
       </div>
     </div>
     <div class="photo-bottom" data-html2canvas-ignore>
@@ -559,8 +563,53 @@
         position: absolute;
         left: 32px;
         z-index: 11;
+        padding: 8px;
         color: #FFFFFF;
         font-size: 28px;
+        border: 2px solid #FFFFFF;
+
+        .watermark-edit {
+          position: absolute;
+          right: 0;
+          top: 0;
+          z-index: 1;
+          width: 80px;
+          height: 48px;
+          line-height: 48px;
+          text-align: center;
+          background: #FFFFFF;
+          box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
+          border-radius: 24px;
+          color: #222222;
+          font-size: 24px;
+          transform: translate(50%, -50%);
+
+          image {
+            width: 32px;
+            height: 32px;
+          }
+        }
+
+        .watermark-close {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: absolute;
+          left: 0;
+          top: 0;
+          z-index: 1;
+          width: 48px;
+          height: 48px;
+          background: #FFFFFF;
+          border-radius: 50%;
+          box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
+          transform: translate(-50%, -50%);
+
+          image {
+            width: 32px;
+            height: 32px;
+          }
+        }
       }
     }
 
@@ -791,6 +840,7 @@
       }
 
       .watermark {
+        border-color: transparent;
         // bottom: 38px;
       }
     }
diff --git a/src/saas/AppCountryAlbum/images/close-b.png b/src/saas/AppCountryAlbum/images/close-b.png
new file mode 100644
index 0000000000000000000000000000000000000000..32c5b7e759871a09251248300a2bdff9e490b220
GIT binary patch
literal 685
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07Sip>6gA}f5OZv>fz$EVJ;usRa
z`8I5~ACsd<>eaTE8_e?=znIi9h-EQtyfiKUfppHsD=fVqrC(@7Sn*u!>N*nUxh?Qo
zv0Cv-qc>;XMBUgi`OLk!*53=C-I+U6cWPIdL4d)7#07Wr<aybenfq_vGpT*C+dNT&
zDS3}^j)_#bqre>pNyj+<<(Hq!GM`>>HEZs%LYpHclAG*jpUu-<rmD@bD1QBQd5(Z(
z#tb!!%NZXX6zlnwwz-nAkbS>%-$UV0t*MVcR{S}-@#dN<Ob6JGO|&pj_+=Ybu4ffI
z>*Uv(CCM|NW#yzcY@T(>J(9OHg=vv^+ry6J%*>Of+3D*pY0gsV&<tOFby3{<{Z98C
z#kcVZ><C_c^`3$K@_uDY?{6;B(ZxmzeoN+lS#G#6cbn<+i1l}V@70KwJ)oVlddXr=
z9tI=T<?A=Im`rfn<!Sx0JukZNNcFm@-gnM0yhvbNnDlgE?4;mRUXym&*PcJ>aI1WR
z!|9_XJF*X4@pgJ&bCyRzcjq!&H?~A0bB@B2MI|cl4{dZ;5Nfb)ioRBw)TO(0I-_jH
zdme|Ntyg~}E|U%Gn7dNOkKvbw+|O^8+3y$(kN;8H`Rd8;tt@-aPpo+1t#`1(d(zY?
zMLe<pg~J$j*jX-Lm!y`M0Cd7EBVLxAQ&!V5*B!eiq%-}r@7AbV_e;WG{J(hLKYFNR
zm&~3eFODbgvY+YWH1(}H|GybKG`1W)^UFK!v;G%W=Kt-D^1)V0x#C9qZ-J7Er>mdK
II;Vst00|-%t^fc4

literal 0
HcmV?d00001