From d53a3a189332ccb2eef681138402ba55db070977 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 1 Jun 2022 16:19:00 +0800
Subject: [PATCH 1/4] 29991

---
 src/saas/AppCountryAlbum/EditAlbum.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/saas/AppCountryAlbum/EditAlbum.vue b/src/saas/AppCountryAlbum/EditAlbum.vue
index 36846600..88cc5524 100644
--- a/src/saas/AppCountryAlbum/EditAlbum.vue
+++ b/src/saas/AppCountryAlbum/EditAlbum.vue
@@ -370,6 +370,7 @@
       margin-bottom: 4px;
       box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.02);
       border-radius: 4px;
+      overflow: hidden;
 
       .icon {
         position: absolute;

From c302863b96a3fc92d156fd0d3cff4acb7804dffb Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 1 Jun 2022 16:24:18 +0800
Subject: [PATCH 2/4] bug

---
 src/saas/AppCountryAlbum/WatermarkConfig.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/saas/AppCountryAlbum/WatermarkConfig.vue b/src/saas/AppCountryAlbum/WatermarkConfig.vue
index b8b79fc0..4fe2888a 100644
--- a/src/saas/AppCountryAlbum/WatermarkConfig.vue
+++ b/src/saas/AppCountryAlbum/WatermarkConfig.vue
@@ -12,7 +12,7 @@
           </div>
           <u-icon name="arrow-right" color="#E1E2E3" v-if="item.editEnable !== '0'"></u-icon>
         </div>
-        <picker mode="date" style="flex: 1;" v-if="item.fieldType === '7'" :value="item.defaultValue" @change="e => onDateChange(e, index)">
+        <picker mode="date" :disabled="item.editEnable === '0'" style="flex: 1;" v-if="item.fieldType === '7'" :value="item.defaultValue" @change="e => onDateChange(e, index)">
           <div class="right">
             <div class="right-left">
               <h2>{{ mapFieldLable(item.type) }}</h2>
@@ -21,7 +21,7 @@
             <u-icon name="arrow-right" color="#E1E2E3" v-if="item.editEnable !== '0'"></u-icon>
           </div>
         </picker>
-        <picker mode="time" style="flex: 1;" v-if="item.fieldType === '6'" :value="item.defaultValue" @change="e => onDateChange(e, index)">
+        <picker mode="time" style="flex: 1;" :disabled="item.editEnable === '0'" v-if="item.fieldType === '6'" :value="item.defaultValue" @change="e => onDateChange(e, index)">
           <div class="right">
             <div class="right-left">
               <h2>{{ mapFieldLable(item.type) }}</h2>

From 96a89214c13c23e06f2049348c72223cb869f3b6 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 1 Jun 2022 16:38:12 +0800
Subject: [PATCH 3/4] =?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/AlbumDetail.vue     | 2 +-
 src/saas/AppCountryAlbum/EditAlbum.vue       | 6 +++---
 src/saas/AppCountryAlbum/components/Home.vue | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/saas/AppCountryAlbum/AlbumDetail.vue b/src/saas/AppCountryAlbum/AlbumDetail.vue
index 0c8954d6..c0284eaa 100644
--- a/src/saas/AppCountryAlbum/AlbumDetail.vue
+++ b/src/saas/AppCountryAlbum/AlbumDetail.vue
@@ -48,7 +48,7 @@
       <div class="photo-item__wrapper">
         <div class="photo-item" @click="linkTo('./Photo?id=' + item.id)" v-for="(item, index) in list" :key="index">
           <!-- <image :src="item.photoUrl" mode="aspectFill" /> -->
-          <u-lazy-load :image="item.photoUrl" :loading-img="$cdn + 'watermark/loading.png'" img-mode="aspectFill"></u-lazy-load>
+          <u-lazy-load :image="item.photoUrl" :height="328" :loading-img="$cdn + 'watermark/loading.png'" img-mode="aspectFill"></u-lazy-load>
           <div class="photo-item__text">
             <h2><AiOpenData v-if="item.createUserId" type="userName" :openid="item.createUserId"></AiOpenData></h2>
             <p>{{ item.createTime }}</p>
diff --git a/src/saas/AppCountryAlbum/EditAlbum.vue b/src/saas/AppCountryAlbum/EditAlbum.vue
index 88cc5524..4253597c 100644
--- a/src/saas/AppCountryAlbum/EditAlbum.vue
+++ b/src/saas/AppCountryAlbum/EditAlbum.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="EditAlbum" v-if="pageShow">
     <div class="img-item" v-for="(item, index) in list" :key="index" @click="choose(index)">
-      <u-lazy-load class="img" :loading-img="$cdn + 'watermark/loading.png'" :image="item.photoUrl" img-mode="aspectFill"></u-lazy-load>
+      <u-lazy-load class="img"  :height="182" :loading-img="$cdn + 'watermark/loading.png'" :image="item.photoUrl" img-mode="scaleToFill"></u-lazy-load>
       <span class="icon" v-if="!item.checked"></span>
       <image class="icon" v-else src="./images/img-choose.png" />
     </div>
@@ -383,8 +383,8 @@
       }
 
       .img {
-        width: 100%;
-        height: 100%;
+        width: 182px;
+        height: 182px;
       }
 
       span {
diff --git a/src/saas/AppCountryAlbum/components/Home.vue b/src/saas/AppCountryAlbum/components/Home.vue
index 48a3e643..d0a9a4fa 100644
--- a/src/saas/AppCountryAlbum/components/Home.vue
+++ b/src/saas/AppCountryAlbum/components/Home.vue
@@ -55,7 +55,7 @@
         <div class="item" v-for="(item, index) in list" :key="index" @click="linkTo('./AlbumDetail?id=' + item.id)">
           <span v-if="item.photoHasRead === 'NO'">未查看</span>
           <image src="./../images/icon.png" :loading-img="$cdn + 'watermark/loading.png'" v-if="!item.lastPhotoUrl" />
-          <u-lazy-load class="item-img" :image="item.lastPhotoUrl" v-else img-mode="aspectFill"></u-lazy-load>
+          <u-lazy-load class="item-img" img-mode="aspectFill" :height="328" :image="item.lastPhotoUrl" v-else></u-lazy-load>
           <div class="item-bottom">
             <h2>{{ item.albumName }}</h2>
             <div class="item-bottom__info">

From f176f028f39ce42afefa4ae449ebef5b360d03e7 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 1 Jun 2022 16:53:30 +0800
Subject: [PATCH 4/4] =?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/AttendanceFiexdTime.vue    | 12 ++++++------
 src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue |  8 ++++----
 src/saas/AppCountryAlbum/Watermark.vue              |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue b/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue
index 0034d068..fd4150b3 100644
--- a/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue
+++ b/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue
@@ -6,7 +6,7 @@
           <label>*</label>
           <span>上班打卡时间</span>
         </div>
-        <picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workInTime')">
+        <picker mode="time" @change="e => onTimeChange(e, 'workInTime')">
           <div class="right">
             <span>{{ form.workInTime || '请设置时间' }}</span>
             <image src="./images/right.png" />
@@ -18,7 +18,7 @@
           <label>*</label>
           <span>下班打卡时间</span>
         </div>
-        <picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workOutTime')">
+        <picker mode="time" @change="e => onTimeChange(e, 'workOutTime')">
           <div class="right">
             <span>{{ form.workOutTime || '请设置时间' }}</span>
             <image src="./images/right.png" />
@@ -41,7 +41,7 @@
           <label>*</label>
           <span>休息开始</span>
         </div>
-        <picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'restTimeBegin')">
+        <picker mode="time" @change="e => onTimeChange(e, 'restTimeBegin')">
           <div class="right">
             <span>{{ form.restTimeBegin || '请设置时间' }}</span>
             <image src="./images/right.png" />
@@ -53,7 +53,7 @@
           <label>*</label>
           <span>休息结束</span>
         </div>
-        <picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'restTimeEnd')">
+        <picker mode="time" @change="e => onTimeChange(e, 'restTimeEnd')">
           <div class="right">
             <span>{{ form.restTimeEnd || '请设置时间' }}</span>
             <image src="./images/right.png" />
@@ -73,7 +73,7 @@
           <label>*</label>
           <span>上班打卡</span>
         </div>
-        <picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workInFrom')">
+        <picker mode="time" @change="e => onTimeChange(e, 'workInFrom')">
           <div class="right">
             <span>{{ form.workInFrom || '请设置时间' }}</span>
             <image src="./images/right.png" />
@@ -85,7 +85,7 @@
           <label>*</label>
           <span>下班打卡</span>
         </div>
-        <picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workOutEnd')">
+        <picker mode="time" @change="e => onTimeChange(e, 'workOutEnd')">
           <div class="right">
             <span>{{ form.workOutEnd || '请设置时间' }}</span>
             <image src="./images/right.png" />
diff --git a/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue b/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue
index 4d6f8b2e..ccfe7c55 100644
--- a/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue
+++ b/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue
@@ -6,7 +6,7 @@
           <label>*</label>
           <span>最早允许打卡时间</span>
         </div>
-        <picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workInFrom')">
+        <picker mode="time" @change="e => onTimeChange(e, 'workInFrom')">
           <div class="right">
             <span>{{ form.workInFrom || '请设置时间' }}</span>
             <image src="./images/right.png" />
@@ -18,7 +18,7 @@
           <label>*</label>
           <span>最晚允许打卡时间</span>
         </div>
-        <picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workOutEnd')">
+        <picker mode="time" @change="e => onTimeChange(e, 'workOutEnd')">
           <div class="right">
             <span>{{ form.workOutEnd || '请设置时间' }}</span>
             <image src="./images/right.png" />
@@ -41,7 +41,7 @@
           <label>*</label>
           <span>休息开始</span>
         </div>
-        <picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'restTimeBegin')">
+        <picker mode="time" @change="e => onTimeChange(e, 'restTimeBegin')">
           <div class="right">
             <span>{{ form.restTimeBegin || '请设置时间' }}</span>
             <image src="./images/right.png" />
@@ -53,7 +53,7 @@
           <label>*</label>
           <span>休息结束</span>
         </div>
-        <picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'restTimeEnd')">
+        <picker mode="time" @change="e => onTimeChange(e, 'restTimeEnd')">
           <div class="right">
             <span>{{ form.restTimeEnd || '请设置时间' }}</span>
             <image src="./images/right.png" />
diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index eb0e99b3..f6fd3935 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -153,7 +153,7 @@
         albumList: [],
         address: {},
         x: 32,
-        y: 200,
+        y: 24,
         startX: 0,
         startY: 0,
         canvasHeight: 0