From ed5fb11725f7392d8618747f193e42c7793d8d30 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 1 Jun 2022 10:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppCountryAlbum/Attendance.vue | 2 +-
 src/saas/AppCountryAlbum/Photo.vue      | 5 +----
 src/saas/AppCountryAlbum/Watermark.vue  | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/saas/AppCountryAlbum/Attendance.vue b/src/saas/AppCountryAlbum/Attendance.vue
index b4704caf..c57465dc 100644
--- a/src/saas/AppCountryAlbum/Attendance.vue
+++ b/src/saas/AppCountryAlbum/Attendance.vue
@@ -22,7 +22,7 @@
           <span @click="changeTab(1)" :class="[currIndex === 1 ? 'active' : '']">已出勤 {{ attendanceCount.hasIn || 0 }}</span>
           <span @click="changeTab(2)" :class="[currIndex === 2 ? 'active' : '']">未出勤 {{ attendanceCount.hasOut || 0 }}</span>
         </div>
-        <div class="right" @click="linkTo('./AttendanceSetting')" v-if="!isAdmin">考勤设置</div>
+        <div class="right" @click="linkTo('./AttendanceSetting')" v-if="isAdmin">考勤设置</div>
       </div>
       <div class="info-table">
         <div class="table-header">
diff --git a/src/saas/AppCountryAlbum/Photo.vue b/src/saas/AppCountryAlbum/Photo.vue
index f3d0cfeb..80611a63 100644
--- a/src/saas/AppCountryAlbum/Photo.vue
+++ b/src/saas/AppCountryAlbum/Photo.vue
@@ -3,14 +3,11 @@
     <div class="photo-wrapper">
       <image mode="widthFix" :src="img" />
     </div>
-    <!-- <u-popup v-model="isShow" :mask="false" :closeable="false" border-radius="32" mode="bottom" @close="isShow = false, currIndex = -1">
-
-		</u-popup> -->
     <div class="photo-bottom" :class="[isShow ? 'active' : '']">
       <div class="top">
         <h2>查看图片</h2>
         <p>长按图片进行分享给他人</p>
-        <image @click="isShow = false, currIndex = -1" src="./images/down_boldw.png" />
+        <image @click.stop="isShow = false" src="./images/down_boldw.png" />
       </div>
       <div class="btns">
         <div class="btn-item" hover-class="bg-hover" @click="back">
diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index 9369e953..6b194243 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -250,8 +250,8 @@
             allowTaint: true,
             useCORS: true
           }).then((canvas) => {
-            let dataURL = canvas.toDataURL('image/jpg')
-            const file = this.dataURLtoFile(dataURL, 'photo.jpg')
+            let dataURL = canvas.toDataURL('image/png')
+            const file = this.dataURLtoFile(dataURL, 'photo.png')
             let formData = new FormData()
             formData.append('file', file)
             this.$http.post('/admin/file/add2?type=image', formData).then(res => {