From 349692bde6c1dde22678e0f5a679b47157e9f112 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 15:55:24 +0800
Subject: [PATCH 01/10] bug

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

diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue
index 1da2ba56..d2508875 100644
--- a/src/saas/AppCountryAlbum/Watermark.vue
+++ b/src/saas/AppCountryAlbum/Watermark.vue
@@ -63,7 +63,7 @@
     <u-popup v-model="isShowAlbum" :closeable="false" border-radius="32" height="70%" mode="bottom">
 			<div class="album">
         <div class="top">
-          <span @click="isShow = false">取消</span>
+          <span @click="isShowAlbum = false">取消</span>
           <span @click="onConfirm">确定</span>
         </div>
         <scroll-view scroll-y class="album-list__wrapper">

From 6a5b244d92e682ff4b55078b427144aa62532f18 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 16:12:00 +0800
Subject: [PATCH 02/10] 29944

---
 .../components/report/Daily.vue               | 33 +++++++++++-------
 .../components/report/InspectLog.vue          | 33 +++++++++++-------
 .../components/report/MeetingMminutes.vue     | 33 +++++++++++-------
 .../components/report/WorkReport.vue          | 34 +++++++++++--------
 4 files changed, 80 insertions(+), 53 deletions(-)

diff --git a/src/saas/AppCountryAlbum/components/report/Daily.vue b/src/saas/AppCountryAlbum/components/report/Daily.vue
index 4c4b168d..1d9cc7fc 100644
--- a/src/saas/AppCountryAlbum/components/report/Daily.vue
+++ b/src/saas/AppCountryAlbum/components/report/Daily.vue
@@ -141,26 +141,33 @@
 
       addPhoto () {
         uni.chooseImage({
-          count: 1,
+          count: 9,
           sizeType: ['compressed'],
           success: res => {
-            this.$loading()
-            let formData = new FormData()
-            formData.append('file', res.tempFiles[0])
-            this.$http.post('/admin/file/add2?type=image', formData).then(res => {
-              if (res.code === 0) {
-                this.richList.push({
-                  type: 'img',
-                  value: res.data.url
-                })
-              } else {
-                this.$u.toast(res.msg)
-              }
+            res.tempFiles.forEach(v => {
+              this.upload(v)
             })
           }
         })
       },
 
+      upload (img) {
+        let formData = new FormData()
+        formData.append('file', img)
+
+        this.$loading()
+        this.$http.post('/admin/file/add2?type=image', formData).then(res => {
+          if (res.code === 0) {
+            this.richList.push({
+              type: 'img',
+              value: res.data.url
+            })
+          } else {
+            this.$u.toast(res.msg)
+          }
+        })
+      },
+
       confirm () {
         if (!this.content) {
           return this.$u.toast('文本不能为空')
diff --git a/src/saas/AppCountryAlbum/components/report/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
index eabb59e1..4c5a2b23 100644
--- a/src/saas/AppCountryAlbum/components/report/InspectLog.vue
+++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
@@ -150,26 +150,33 @@
 
       addPhoto () {
         uni.chooseImage({
-          count: 1,
+          count: 9,
           sizeType: ['compressed'],
           success: res => {
-            this.$loading()
-            let formData = new FormData()
-            formData.append('file', res.tempFiles[0])
-            this.$http.post('/admin/file/add2?type=image', formData).then(res => {
-              if (res.code === 0) {
-                this.richList.push({
-                  type: 'img',
-                  value: res.data.url
-                })
-              } else {
-                this.$u.toast(res.msg)
-              }
+            res.tempFiles.forEach(v => {
+              this.upload(v)
             })
           }
         })
       },
 
+      upload (img) {
+        let formData = new FormData()
+        formData.append('file', img)
+
+        this.$loading()
+        this.$http.post('/admin/file/add2?type=image', formData).then(res => {
+          if (res.code === 0) {
+            this.richList.push({
+              type: 'img',
+              value: res.data.url
+            })
+          } else {
+            this.$u.toast(res.msg)
+          }
+        })
+      },
+
       confirm () {
         if (!this.content) {
           return this.$u.toast('文本不能为空')
diff --git a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
index 6e465c34..51660a14 100644
--- a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
+++ b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
@@ -171,26 +171,33 @@
 
       addPhoto () {
         uni.chooseImage({
-          count: 1,
+          count: 9,
           sizeType: ['compressed'],
           success: res => {
-            this.$loading()
-            let formData = new FormData()
-            formData.append('file', res.tempFiles[0])
-            this.$http.post('/admin/file/add2?type=image', formData).then(res => {
-              if (res.code === 0) {
-                this.richList.push({
-                  type: 'img',
-                  value: res.data.url
-                })
-              } else {
-                this.$u.toast(res.msg)
-              }
+            res.tempFiles.forEach(v => {
+              this.upload(v)
             })
           }
         })
       },
 
+      upload (img) {
+        let formData = new FormData()
+        formData.append('file', img)
+
+        this.$loading()
+        this.$http.post('/admin/file/add2?type=image', formData).then(res => {
+          if (res.code === 0) {
+            this.richList.push({
+              type: 'img',
+              value: res.data.url
+            })
+          } else {
+            this.$u.toast(res.msg)
+          }
+        })
+      },
+
       confirm () {
         if (!this.content) {
           return this.$u.toast('文本不能为空')
diff --git a/src/saas/AppCountryAlbum/components/report/WorkReport.vue b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
index aec60669..91a69c3f 100644
--- a/src/saas/AppCountryAlbum/components/report/WorkReport.vue
+++ b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
@@ -141,27 +141,33 @@
 
       addPhoto () {
         uni.chooseImage({
-          count: 1,
+          count: 9,
           sizeType: ['compressed'],
           success: res => {
-            this.$loading()
-            let formData = new FormData()
-            formData.append('file', res.tempFiles[0])
-            this.$http.post('/admin/file/add2?type=image', formData).then(res => {
-              console.log(res)
-              if (res.code === 0) {
-                this.richList.push({
-                  type: 'img',
-                  value: res.data.url
-                })
-              } else {
-                this.$u.toast(res.msg)
-              }
+            res.tempFiles.forEach(v => {
+              this.upload(v)
             })
           }
         })
       },
 
+      upload (img) {
+        let formData = new FormData()
+        formData.append('file', img)
+
+        this.$loading()
+        this.$http.post('/admin/file/add2?type=image', formData).then(res => {
+          if (res.code === 0) {
+            this.richList.push({
+              type: 'img',
+              value: res.data.url
+            })
+          } else {
+            this.$u.toast(res.msg)
+          }
+        })
+      },
+
       confirm () {
         if (!this.content) {
           return this.$u.toast('文本不能为空')

From bd2c72e81c03960c38e423b28e3f3f62fd5aad50 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 16:33:22 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppCountryAlbum/AlbumDetail.vue | 2 +-
 src/saas/AppCountryAlbum/Photo.vue       | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/saas/AppCountryAlbum/AlbumDetail.vue b/src/saas/AppCountryAlbum/AlbumDetail.vue
index af867845..1c6c9963 100644
--- a/src/saas/AppCountryAlbum/AlbumDetail.vue
+++ b/src/saas/AppCountryAlbum/AlbumDetail.vue
@@ -43,7 +43,7 @@
         </div>
       </div>
       <div class="photo-item__wrapper">
-        <div class="photo-item" @click="linkTo('./Photo?url=' + item.photoUrl + '&id=' + item.id)" v-for="(item, index) in list" :key="index">
+        <div class="photo-item" @click="linkTo('./Photo?id=' + item.id)" v-for="(item, index) in list" :key="index">
           <image :src="item.photoUrl" mode="aspectFill" />
           <div class="photo-item__text">
             <h2><AiOpenData v-if="item.createUserId" type="userName" :openid="item.createUserId"></AiOpenData></h2>
diff --git a/src/saas/AppCountryAlbum/Photo.vue b/src/saas/AppCountryAlbum/Photo.vue
index 06077c40..540b47e2 100644
--- a/src/saas/AppCountryAlbum/Photo.vue
+++ b/src/saas/AppCountryAlbum/Photo.vue
@@ -36,7 +36,12 @@
 
     onLoad (query) {
       this.id = query.id
-      this.img = query.url
+
+      this.$http.post(`/api/appalbumphoto/queryDetailById?id=${query.id}`).then(res => {
+        if (res.code == 0) {
+          this.img = res.data.photoUrl
+        }
+      })
     },
 
     methods: {

From 4cdbb1959f42d1787b1b1bdff6be68878bce9073 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 16:38:14 +0800
Subject: [PATCH 04/10] bug

---
 src/saas/AppCountryAlbum/components/Home.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/saas/AppCountryAlbum/components/Home.vue b/src/saas/AppCountryAlbum/components/Home.vue
index bead66ef..5983c380 100644
--- a/src/saas/AppCountryAlbum/components/Home.vue
+++ b/src/saas/AppCountryAlbum/components/Home.vue
@@ -83,8 +83,7 @@
         countPhotoNo: '',
         countPhotographer: '',
         list: [],
-        msgInfo: {},
-        userInfo: {}
+        msgInfo: {}
       }
     },
     computed: { ...mapState(['user']) },
@@ -118,7 +117,7 @@
       getUserInfo () {
         this.$http.post('/api/user/info').then(res => {
           if (res.code === 0) {
-            this.userInfo = res.data
+            this.$store.commit('setUser', res.data)
           }
         })
       },

From 9965c96598426db18caed51d92aaa2967f57b3ff Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 16:59:55 +0800
Subject: [PATCH 05/10] bug

---
 src/saas/AppCountryAlbum/Attendance.vue          |  2 +-
 src/saas/AppCountryAlbum/AttendanceFiexdTime.vue | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/saas/AppCountryAlbum/Attendance.vue b/src/saas/AppCountryAlbum/Attendance.vue
index c57465dc..b4704caf 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/AttendanceFiexdTime.vue b/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue
index 06353a78..0034d068 100644
--- a/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue
+++ b/src/saas/AppCountryAlbum/AttendanceFiexdTime.vue
@@ -206,14 +206,22 @@
           return this.$u.toast('请选择下班打卡时间')
         }
 
+        if (this.$dayjs('2020-06-01 ' + this.form.workOutTime).valueOf() <= this.$dayjs('2020-06-01 ' + this.form.workInTime).valueOf()) {
+          return this.$u.toast('下班时间不能早于上班时间')
+        }
+
         if (this.form.openRestTime === '1') {
           if (!this.form.restTimeBegin) {
-            return this.$u.toast('请选择休息时间')
+            return this.$u.toast('请选择休息开始时间')
           }
 
           if (!this.form.restTimeEnd) {
             return this.$u.toast('请选择休息结束时间')
           }
+
+          if (this.$dayjs('2020-06-01 ' + this.form.restTimeEnd).valueOf() <= this.$dayjs('2020-06-01 ' + this.form.restTimeBegin).valueOf()) {
+            return this.$u.toast('休息结束时间不能早于休息开始时间')
+          }
         }
 
         if (!this.form.workInFrom) {
@@ -224,6 +232,10 @@
           return this.$u.toast('请选择下班打卡最晚时间')
         }
 
+        if (this.$dayjs('2020-06-01 ' + this.form.workOutEnd).valueOf() <= this.$dayjs('2020-06-01 ' + this.form.workInFrom).valueOf()) {
+          return this.$u.toast('下班打卡最晚时间不能早于上班打卡最早时间')
+        }
+
         if (this.form.openWorkPoint === '1' && !this.address.address) {
           return this.$u.toast('请选择固定打卡点')
         }

From 46e96a591d03bd3ae9a777d8817c46026320b8b9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 17:00:54 +0800
Subject: [PATCH 06/10] 29911

---
 src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue b/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue
index 9d2061fa..4d6f8b2e 100644
--- a/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue
+++ b/src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue
@@ -193,6 +193,10 @@
           return this.$u.toast('请选择最晚打卡时间')
         }
 
+        if (this.$dayjs('2020-06-01 ' + this.form.workOutEnd).valueOf() <= this.$dayjs('2020-06-01 ' + this.form.workInFrom).valueOf()) {
+          return this.$u.toast('最晚打卡时间不能最早打卡时间')
+        }
+
         if (this.form.openRestTime === '1') {
           if (!this.form.restTimeBegin) {
             return this.$u.toast('请选择休息时间')
@@ -201,6 +205,10 @@
           if (!this.form.restTimeEnd) {
             return this.$u.toast('请选择休息结束时间')
           }
+
+          if (this.$dayjs('2020-06-01 ' + this.form.restTimeEnd).valueOf() <= this.$dayjs('2020-06-01 ' + this.form.restTimeBegin).valueOf()) {
+            return this.$u.toast('休息结束时间不能早于休息开始时间')
+          }
         }
 
         if (!this.form.workHoursLimit) {

From c0dd166af33eda7fb76ba5c50f78ba6cb0726eaa Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 17:13:17 +0800
Subject: [PATCH 07/10] 29793

---
 src/saas/AppCountryAlbum/AddReport.vue                   | 2 +-
 src/saas/AppCountryAlbum/components/report/Daily.vue     | 8 ++++++++
 .../AppCountryAlbum/components/report/InspectLog.vue     | 8 ++++++++
 .../components/report/MeetingMminutes.vue                | 8 ++++++++
 .../AppCountryAlbum/components/report/WorkReport.vue     | 9 ++++++++-
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue
index 1c0cb40e..2f2a4bdc 100644
--- a/src/saas/AppCountryAlbum/AddReport.vue
+++ b/src/saas/AppCountryAlbum/AddReport.vue
@@ -62,7 +62,7 @@
 
       save () {
         this.$loading()
-        this.$refs.reportItem.screenshot().then(canvas => {
+        this.$refs.reportItem.screenshot() && this.$refs.reportItem.screenshot().then(canvas => {
           let dataURL = canvas.toDataURL('image/png')
           const file = this.dataURLtoFile(dataURL, 'photo.png')
           let formData = new FormData()
diff --git a/src/saas/AppCountryAlbum/components/report/Daily.vue b/src/saas/AppCountryAlbum/components/report/Daily.vue
index 1d9cc7fc..8782bb62 100644
--- a/src/saas/AppCountryAlbum/components/report/Daily.vue
+++ b/src/saas/AppCountryAlbum/components/report/Daily.vue
@@ -42,6 +42,7 @@
 <script>
   import html2canvas from 'html2canvas'
   import RenderContent from './RenderContent.vue'
+  import { mapFieldLable } from './../../config'
   export default {
     name: 'Daily',
     label: '日报',
@@ -119,6 +120,13 @@
 
     methods: {
       screenshot () {
+        for (let i = 0; i < this.configList.length; i ++) {
+          if (['2', '3', '4', '5'].indexOf(this.configList[i].fieldType) === -1 && this.configList[i].fieldType && !this.configList[i].defaultValue && this.configList[i].status === '1') {
+            this.$u.toast(`请输入${mapFieldLable(this.config[i].type)}`)
+            return false
+          }
+        }
+
         const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
 
         return html2canvas(this.$refs.report, {
diff --git a/src/saas/AppCountryAlbum/components/report/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
index 4c5a2b23..95e07bf1 100644
--- a/src/saas/AppCountryAlbum/components/report/InspectLog.vue
+++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
@@ -43,6 +43,7 @@
 
 <script>
   import html2canvas from 'html2canvas'
+  import { mapFieldLable } from './../../config'
   import RenderContent from './RenderContent.vue'
   export default {
     name: 'InspectLog',
@@ -128,6 +129,13 @@
 
     methods: {
       screenshot () {
+        for (let i = 0; i < this.configList.length; i ++) {
+          if (['2', '3', '4', '5'].indexOf(this.configList[i].fieldType) === -1 && this.configList[i].fieldType && !this.configList[i].defaultValue && this.configList[i].status === '1') {
+            this.$u.toast(`请输入${mapFieldLable(this.config[i].type)}`)
+            return false
+          }
+        }
+
         const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
 
         return html2canvas(this.$refs.report, {
diff --git a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
index 51660a14..4fb3dd8e 100644
--- a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
+++ b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
@@ -55,6 +55,7 @@
 <script>
   import html2canvas from 'html2canvas'
   import RenderContent from './RenderContent.vue'
+  import { mapFieldLable } from './../../config'
   export default {
     name: 'MeetingMminutes',
 
@@ -149,6 +150,13 @@
 
     methods: {
       screenshot () {
+        for (let i = 0; i < this.configList.length; i ++) {
+          if (['2', '3', '4', '5'].indexOf(this.configList[i].fieldType) === -1 && this.configList[i].fieldType && !this.configList[i].defaultValue && this.configList[i].status === '1') {
+            this.$u.toast(`请输入${mapFieldLable(this.config[i].type)}`)
+            return false
+          }
+        }
+
         const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
 
         return html2canvas(this.$refs.report, {
diff --git a/src/saas/AppCountryAlbum/components/report/WorkReport.vue b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
index 91a69c3f..bc2a5643 100644
--- a/src/saas/AppCountryAlbum/components/report/WorkReport.vue
+++ b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
@@ -41,6 +41,7 @@
 <script>
   import html2canvas from 'html2canvas'
   import RenderContent from './RenderContent.vue'
+  import { mapFieldLable } from './../../config'
 
   export default {
     name: 'WorkReport',
@@ -119,8 +120,14 @@
 
     methods: {
       screenshot () {
-        const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
+        for (let i = 0; i < this.configList.length; i ++) {
+          if (['2', '3', '4', '5'].indexOf(this.configList[i].fieldType) === -1 && this.configList[i].fieldType && !this.configList[i].defaultValue && this.configList[i].status === '1') {
+            this.$u.toast(`请输入${mapFieldLable(this.config[i].type)}`)
+            return false
+          }
+        }
 
+        const height = this.$refs.report.offsetHeight - this.$refs.add.offsetHeight
         return html2canvas(this.$refs.report, {
           allowTaint: true,
           useCORS: true,

From 5bec41e0b6f0735b6181c001842d9f7c600c4263 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 17:16:30 +0800
Subject: [PATCH 08/10] bug

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

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">

From 2243e5b0d68551af8029f04f967779d1c958c94c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 17:23:27 +0800
Subject: [PATCH 09/10] 29857

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

diff --git a/src/saas/AppCountryAlbum/PersonnelSetting.vue b/src/saas/AppCountryAlbum/PersonnelSetting.vue
index 0005b50b..ae2b8e81 100644
--- a/src/saas/AppCountryAlbum/PersonnelSetting.vue
+++ b/src/saas/AppCountryAlbum/PersonnelSetting.vue
@@ -26,6 +26,7 @@
         <image src="./images/remove.png" @click="remove(index)" />
       </div>
     </div>
+    <div class="tips">注：如选中人员未展示，可能是未授权该成员应用权限，需要先对这些成员进行应用授权。 </div>
     <div class="form-btn" hover-class="text-hover" @click="save">保存</div>
   </div>
 </template>

From 3fbc6c336f56af9334ebbd7d60f67407bfa05bcc Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 30 May 2022 17:55:58 +0800
Subject: [PATCH 10/10] 29954

---
 src/saas/AppCountryAlbum/AddReport.vue      |   8 +-
 src/saas/AppCountryAlbum/AlbumDetail.vue    | 105 +++++++++++---------
 src/saas/AppCountryAlbum/ReportImg.vue      |  14 ++-
 src/saas/AppCountryAlbum/images/edit.png    | Bin 0 -> 119 bytes
 src/saas/AppCountryAlbum/images/setting.png | Bin 0 -> 428 bytes
 5 files changed, 74 insertions(+), 53 deletions(-)
 create mode 100644 src/saas/AppCountryAlbum/images/edit.png
 create mode 100644 src/saas/AppCountryAlbum/images/setting.png

diff --git a/src/saas/AppCountryAlbum/AddReport.vue b/src/saas/AppCountryAlbum/AddReport.vue
index 2f2a4bdc..40fd15f2 100644
--- a/src/saas/AppCountryAlbum/AddReport.vue
+++ b/src/saas/AppCountryAlbum/AddReport.vue
@@ -28,7 +28,8 @@
       return {
         component: 'WorkReport',
         configList: [],
-        currIndex: 0
+        currIndex: 0,
+        albumId: ''
       }
     },
 
@@ -47,7 +48,8 @@
       }
     },
 
-    onLoad () {
+    onLoad (query) {
+      this.albumId = query.id || ''
       this.getConfig()
     },
 
@@ -71,7 +73,7 @@
             if (res.code === 0) {
               const data = this.configList[this.currIndex]
               uni.navigateTo({
-                url: `./ReportImg?img=${res.data.url}&type=${data.watermarkType}&templateId=${data.id}`
+                url: `./ReportImg?albumId=${this.albumId}&img=${res.data.url}&type=${data.watermarkType}&templateId=${data.id}`
               })
             }
 
diff --git a/src/saas/AppCountryAlbum/AlbumDetail.vue b/src/saas/AppCountryAlbum/AlbumDetail.vue
index 1c6c9963..86b0c6bf 100644
--- a/src/saas/AppCountryAlbum/AlbumDetail.vue
+++ b/src/saas/AppCountryAlbum/AlbumDetail.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="photo">
+  <div class="photo" v-if="pageShow">
     <div class="photo-header">
-      <image :src="coverImg" mode="aspectFill" />
-      <div>
-        <h2>{{ info.albumName }}</h2>
-        <span @click="linkTo('./AddAlbum?id=' + id)">相册设置</span>
+      <h2>{{ info.albumName }}</h2>
+      <div class="right" @click="linkTo('./AddAlbum?id=' + id)" hover-class="text-hover" v-if="id !== '1'">
+        <image src="./images/setting.png" />
+        <span>相册设置</span>
       </div>
     </div>
     <div class="photo-info">
@@ -27,20 +27,23 @@
     </div>
     <div class="photo-list">
       <div class="photo-title">
-        <h2>照片列表</h2>
-        <div class="right">
+        <div class="left">
           <picker mode="date" @change="onChange">
-            <div class="right-item">
+            <div class="left-item">
               <span>{{ date || '所有日期' }}</span>
               <image src="./images/down.png" />
             </div>
           </picker>
-          <div class="right-item" style="margin-right: 0;" @click="toChoose">
+          <div class="left-item" style="margin-right: 0;" @click="toChoose">
             <span v-if="userId"><AiOpenData v-if="userId" type="userName" :openid="userId"></AiOpenData></span>
             <span v-else>所有干部</span>
             <image src="./images/down.png" />
           </div>
         </div>
+        <div class="right" hover-class="text-hover" @click="toEdit">
+          <image src="./images/edit.png" />
+          <span>编辑照片</span>
+        </div>
       </div>
       <div class="photo-item__wrapper">
         <div class="photo-item" @click="linkTo('./Photo?id=' + item.id)" v-for="(item, index) in list" :key="index">
@@ -54,7 +57,7 @@
       </div>
     </div>
     <div class="btn-wrapper">
-      <div class="btn" hover-class="text-hover" @click="toEdit">编辑照片</div>
+      <div class="btn" @click="linkTo('./AddReport?id=' + id)">上传拼图汇报</div>
       <div class="btn" @click="toAddImg" hover-class="text-hover">上传照片</div>
     </div>
   </div>
@@ -74,7 +77,6 @@
         info: {},
         name: '',
         date: '',
-        coverImg: '',
         imgList: [],
         hideStatus: false,
         pageShow: false,
@@ -140,7 +142,7 @@
           fromDepartmentId: 0,
           mode: 'single',
           selectedOpenUserIds: this.userId ? [this.userId] : ''
-        }).then(res => {
+          }).then(res => {
           console.log(res)
           uni.hideLoading()
           if (res.userList && res.userList) {
@@ -179,10 +181,13 @@
       },
 
       getInfo (id) {
+        this.$loading()
         this.$http.post(`/api/appalbum/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
           }
+
+          this.pageShow = true
         })
       },
 
@@ -235,10 +240,6 @@
               this.list = res.data.records
             }
 
-            if (res.data.records.length && !this.coverImg) {
-              this.coverImg = res.data.records[0].photoUrl
-            }
-
             if (res.data.records.length < 10) {
               this.isMore = true
               uni.hideLoading()
@@ -262,7 +263,9 @@
 
 <style lang="scss" socped>
   .photo {
+    min-height: 100vh;
     padding-bottom: 130px;
+    box-sizing: border-box;
 
     * {
       box-sizing: border-box;
@@ -330,11 +333,11 @@
           font-weight: 600;
         }
 
-        .right {
+        .left {
           display: flex;
           align-items: center;
 
-          .right-item {
+          .left-item {
             display: flex;
             align-items: center;
             margin-right: 32px;
@@ -351,49 +354,56 @@
             }
           }
         }
+
+        .right {
+          display: flex;
+          align-items: center;
+          font-size: 26px;
+          color: #333;
+
+          image {
+            width: 32px;
+            height: 32px;
+            margin-right: 8px;
+          }
+        }
       }
     }
 
     .photo-header {
-      position: relative;
-      height: 400px;
-      background: rgba(0,0,0, 0.7);
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 100%;
+      height: 148px;
+      padding: 0 32rpx;
+      color: #Fff;
+      background: #3975C6;
 
       div {
-        position: relative;
         display: flex;
-        z-index: 1;
         align-items: center;
-        justify-content: center;
-        flex-direction: column;
-        width: 100%;
-        height: 100%;
-      }
-
-      span {
-        width: 176px;
+        width: 216px;
         height: 56px;
         line-height: 56px;
-        margin-top: 16px;
         text-align: center;
-        background: rgba(0, 0, 0, 0.6);
-        color: #fff;
+        justify-content: center;
         border-radius: 28px;
+        font-size: 28px;
+        background: #285DA4;
       }
 
       image {
-        position: absolute;
-        z-index: 1;
-        left: 0;
-        top: 0;
-        width: 100%;
-        height: 400px;
-        filter: blur(2px);
+        width: 32px;
+        height: 32px;
+        margin-right: 8px;
       }
 
       h2 {
+        flex: 1;
+        margin-right: 20px;
         color: #fff;
-        font-size: 56px;
+        font-size: 38px;
       }
     }
 
@@ -401,8 +411,7 @@
       display: flex;
       align-items: center;
       height: 168px;
-      background: #FFFFFF;
-      box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
+      background: #3975C6;
 
       & > div {
         flex: 1;
@@ -411,12 +420,12 @@
         h2 {
           margin-bottom: 10px;
           font-weight: 600;
-          font-size: 38px;
-          color: #333333;
+          font-size: 44px;
+          color: #fff;
         }
 
         span {
-          color: #999999;
+          color: #C3D5EE;
           font-size: 26px;
         }
       }
@@ -438,7 +447,7 @@
       }
 
       .btn:first-child {
-        width: 270px;
+        flex: 1;
         height: 112px;
         line-height: 112px;
         text-align: center;
diff --git a/src/saas/AppCountryAlbum/ReportImg.vue b/src/saas/AppCountryAlbum/ReportImg.vue
index 3c253dd8..c2fe6564 100644
--- a/src/saas/AppCountryAlbum/ReportImg.vue
+++ b/src/saas/AppCountryAlbum/ReportImg.vue
@@ -91,6 +91,7 @@
       this.img = query.img
       this.type = query.type
       this.templateId = query.templateId
+      this.albumId = query.albumId
 
       this.getWatermarkList()
     },
@@ -145,8 +146,17 @@
               }
             })
 
-            this.albumName = this.albumList[0].label
-            this.albumId = this.albumList[0].value
+            if (this.albumId) {
+              this.albumName = this.albumList.filter((v, index) => {
+                if (v.value === this.albumId) {
+                  this.currIndex = index
+                }
+                return v.value === this.albumId
+              })[0].label
+            } else {
+              this.albumName = this.albumList[0].label
+              this.albumId = this.albumList[0].value
+            }
           }
         })
       }
diff --git a/src/saas/AppCountryAlbum/images/edit.png b/src/saas/AppCountryAlbum/images/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..99c6865e5a51bf959fea81f1ce29be6b4c4f5353
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;V{wqX6T`Z5GB1G~wg8_HS0HU{
zY<%M5GX;=zNswPKgTu2MX+VyUr;B3<$Mxid2FB0!J}ftRco?F?m=~1qTkistW$<+M
Kb6Mw<&;$U4GaOm~

literal 0
HcmV?d00001

diff --git a/src/saas/AppCountryAlbum/images/setting.png b/src/saas/AppCountryAlbum/images/setting.png
new file mode 100644
index 0000000000000000000000000000000000000000..6019282adb506dbdcb6fadbb800d28bed090b92a
GIT binary patch
literal 428
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|G6Q@<T!Hj|
zx`02@Ys-L^DU}5I1v4<Ru(I*+i)tA-I{5~Lghm!uPMW`H_4-YlFFttm?Z?mGe=gZ?
znE_ON*we)^#Nzbc$v4HC6a?Bfs)&A<jWMYF->y?&G4Ghw4cEWnn`<6f{1N)(Um3W8
z)$z&R*T<V@1<NkkEcM9w_qCPFr?pH-xfodP?69`yUC_Gd5ak8o9=1$gJX1J03<Z=F
z4m<q2^<6#qX-|-vkHydG?@=a;HN&FgW~StHaWm-7(Rw2+!=?K~s3?t*jg@of-0rA`
zTc;uq{N%D$+1}vbY-L{@KjlLAqjuNKrxjOkZlC^iPu}vx14XahPh0xF-txCo{&{*8
ZgL;=ikIU8YH9+q$c)I$ztaD0e0swvz=u!Xx

literal 0
HcmV?d00001